Skip to content

A
amos-boot-biz
Commit 86de6925 authored by tianbo's avatar tianbo
Browse files
Options

隐患修改

parent 554fa276
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 23 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @ 86de6925
......@@ -218,12 +218,13 @@ public interface IOrgUsrService {
List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
/**
* 根据机场人员id获取amos账号id
* 根据机场人员id获取amos账号信息
*
* @param orgUserId
* @return
* @exception
*/
String getAmosIdByOrgUserId(String orgUserId) throws Exception;
AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception;
/**
* 查询目标公司下所有人员的简要信息，数据包含：所在公司id和name ,人员id和name,岗位id和name
......
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java
View file @ 86de6925
......@@ -95,7 +95,8 @@ public class LatentDanger extends BasicEntity {
private Integer overtimeState;
private String reformJson;
@TableField(typeHandler = JacksonTypeHandler.class)
private JSONObject reformJson;
/**
* 隐患状态（1：待评审；2：待治理；3：安措计划中；4：逾期未治理；5：待验证；6：治理完毕；7：已撤销）
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 86de6925
......@@ -489,8 +489,8 @@ public class OrgUsrController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/amos/{orgUserId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据机场人员id获取amos平台人员id", notes = "根据机场人员id获取amos平台人员id")
public ResponseModel<String> getAmosIdByOrgUserId(@PathVariable String orgUserId) throws Exception {
@ApiOperation(httpMethod = "GET", value = "根据机场人员id获取amos平台人员信息", notes = "根据机场人员id获取amos平台人员信息")
public ResponseModel<AgencyUserModel> getAmosIdByOrgUserId(@PathVariable String orgUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdByOrgUserId(orgUserId));
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 86de6925
......@@ -1635,12 +1635,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
@Override
public String getAmosIdByOrgUserId(String orgUserId) throws Exception {
public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception {
OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr,
orgUserId));
if (ValidationUtil.isEmpty(orgUsr)) {
throw new Exception("账号不存在");
}
return orgUsr.getAmosOrgId();
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsr.getAmosOrgId()).getResult();
if (ValidationUtil.isEmpty(amosUser)) {
throw new Exception("账号不存在");
}
return amosUser;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java
View file @ 86de6925
......@@ -79,5 +79,5 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
* @param paramMap
* @return
*/
IPage<LatentDanger> selectPageByParam(Page page, @Param("paramMap") Map<String, Object> paramMap);
IPage<LatentDanger> selectPageByParam(Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/feign/JcsFeignClient.java
View file @ 86de6925
package com.yeejoin.amos.latentdanger.business.feign;
import com.yeejoin.amos.boot.module.common.api.feign.MultipartSupportConfig;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -16,7 +17,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
public interface JcsFeignClient {
/**
* 根据机场人员id获取amos平台人员id
*
* @param orgUserId 机场单位人员id
* @return AgencyUserModel 平台人员信息
**/
@RequestMapping(value = "/org-usr/amos/{orgUserId}", method = RequestMethod.GET)
ResponseModel<String> getAmosIdByUserId(@PathVariable String orgUserId);
ResponseModel<AgencyUserModel> getAmosIdByUserId(@PathVariable String orgUserId);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/LatentDangerDto.java
View file @ 86de6925
......@@ -145,4 +145,14 @@ public class LatentDangerDto {
* 提交信息
*/
private JSONObject flowJson;
/**
* 整改责任人id
*/
private String reformLeaderId;
/**
* 整改资料信息
*/
private JSONObject reformJson;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/LatentDangerExecuteParam.java
View file @ 86de6925
......@@ -81,5 +81,10 @@ public class LatentDangerExecuteParam {
*/
private String reformLeaderId;
/**
* 整改资料信息
*/
private JSONObject reformJson;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ 86de6925
......@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
......@@ -683,7 +682,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
}
if (!StringUtils.isEmpty(latentDanger.getReformJson())) {
detailVo.setReformJson(JSONObject.parseObject(latentDanger.getReformJson()));
detailVo.setReformJson(latentDanger.getReformJson());
}
if (!StringUtils.isEmpty(latentDanger.getPhotoUrls())) {
List<String> photoUrls = Lists.newArrayList(latentDanger.getPhotoUrls().split(","));
......@@ -1130,15 +1129,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return executeSubmitDto;
}
String planType = bizInfo.get("planType").toString();
String amosUserId = jcsFeignClient.getAmosIdByUserId((String) bizInfo.get("accompanyingUserId")).getResult();
if (ValidationUtil.isEmpty(amosUserId)) {
AgencyUserModel userModel = jcsFeignClient.getAmosIdByUserId((String) bizInfo.get("accompanyingUserId")).getResult();
if (ValidationUtil.isEmpty(userModel)) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("业务信息错误");
return executeSubmitDto;
}
// TODO 修改
// amosUserId = "3400882";
AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId(amosUserId).getResult();
// 工作流中使用平台用户名称，因此这里取userName
String checkLeaderId = userModel.getUserName();
String processInstanceId = latentDanger.getInstanceId();
......@@ -1271,7 +1268,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setDangerState(nextState);
latentDanger.setDangerStateName(nextStateName);
// 当隐患状态当前节点是整改任务分配时，在执行完节点后需要将整改分配责任人id设置为下个节点执行人
// 当隐患状态当前节点是整改任务分配时，在执行完节点后需要将整改分配责任人设置为下个节点执行人
if (LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(currentStateEnum.getCode())) {
if (ValidationUtil.isEmpty(param.getReformLeaderId())) {
executeSubmitDto.setIsOk(false);
......@@ -1279,8 +1276,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
executeSubmitDto.setMsg(executeResultMsg);
return executeSubmitDto;
}
checkLeaderId = jcsFeignClient.getAmosIdByUserId(param.getReformLeaderId()).getResult();
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
AgencyUserModel checkLeader = jcsFeignClient.getAmosIdByUserId(param.getReformLeaderId()).getResult();
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeader.getUserName());
if (!(Boolean) result) {
executeSubmitDto.setIsOk(false);
executeResultMsg = "设置节点执行人失败";
......@@ -1289,6 +1286,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
}
// 当为提交资料节点时，保存提交的资料
if (LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentStateEnum.getCode())) {
latentDanger.setFlowJson(param.getReformJson());
}
// 当计划为单位检查且隐患状态当前节点是提交整改资料时，在执行完节点后需要将整改资料审核人id（检查组长）设置为下个节点执行人
if ("supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentStateEnum.getCode())) {
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
......@@ -1382,13 +1384,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setDangerState(executeTypeEnum.getNextState().getCode());
if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患常规治理)) {
latentDanger.setReformType(LatentDangerReformTypeEnum.常规整改.getCode());
latentDanger.setReformJson(param.getFlowJson().toJSONString());
latentDanger.setReformJson(param.getFlowJson());
latentDanger.setInferOtherThings(param.getInferOtherThings());
latentDanger.setProblemDescription(param.getReasonAnalysis());
latentDanger.setReasonAnalysis(param.getRemark());
} else if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患延期治理)) {
latentDanger.setReformType(LatentDangerReformTypeEnum.延期治理.getCode());
latentDanger.setReformJson(param.getFlowJson().toJSONString());
latentDanger.setReformJson(param.getFlowJson());
latentDanger.setInferOtherThings(param.getInferOtherThings());
latentDanger.setProblemDescription(param.getReasonAnalysis());
latentDanger.setReasonAnalysis(param.getRemark());
......@@ -1805,8 +1807,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
pageParam.put("dangerIds", dangerIdList);
}
IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page(Long.valueOf(pageParam.getCurrent()),
Long.valueOf(pageParam.getSize())), (Map<String, Object>) pageParam);
// IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page((Long.valueOf((String) pageParam.get("current"))),
// (Long.valueOf((String) pageParam.get("size")))), (Map<String, Object>) pageParam);
IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page(((Integer) pageParam.get("current")).longValue(),
((Integer) pageParam.get("size")).longValue()), (Map<String, Object>) pageParam);
Map<String, Object> buildingAbsolutePositionMap = new HashMap<>();
if (!ValidationUtil.isEmpty(iPage.getRecords())) {
try {
......@@ -2010,7 +2014,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
LatentDangerExecuteParam executeParam = new LatentDangerExecuteParam();
if (ValidationUtil.isEmpty(executeType) ||
(LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(latentDangerDto.getDangerState())
&& ValidationUtil.isEmpty(latentDangerDto.getReformLeaderId()))) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("执行参数有误");
return executeSubmitDto;
}
if (LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(latentDangerDto.getDangerState())) {
executeParam.setReformJson(latentDangerDto.getReformJson());
}
executeParam.setExecuteType(executeType);
executeParam.setReformLeaderId(latentDangerDto.getReformLeaderId());
executeSubmit(executeParam, latentDanger, userId, userName, deptId, deptName, executeSubmitDto, reginParams);
......
amos-boot-system-latentdanger/pom.xml
View file @ 86de6925
......@@ -23,6 +23,11 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.10</version>
</dependency>
</dependencies>
<build>
<plugins>
......
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