添加根据人员id查询公司id接口 调整故障维修单位获取方法

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

@@ -268,6 +268,14 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids));
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/company/person/{amosUserId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据amosUserId获取单位ID", notes = "根据amosUserId获取单位ID")
+    public ResponseModel<String> selectPersonId(@PathVariable String amosUserId) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.getParentId(amosUserId));
+    }
+
+
     /**
      * 根据id获取单位人员列表
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,8 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
 
 
     /**
@@ -62,8 +65,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
 
         int auditResult = 0;
         Boolean repairResult = null;
+        Long seq = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
         //根据审核的结果进行业务操作
-        if (condition == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
+        if (condition == AuditResultEnum.AGREE.getCode() && seq.equals(failureDetailsDto.getBizCode())) {
             auditResult = AuditResultEnum.AGREE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -65,6 +65,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     @Autowired
     IFailureRepairlogService failureRepairlog;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
 
     public static String EMERGENCY_COMMAND = "应急指挥科";
     public static String[] PROCESS_NAME = {"提交报修单", "审核", "维修", "验收", "维修中"};
@@ -222,7 +224,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         failureDetailsDto.setSubmissionTime(new Date());
         failureDetailsDto.setFailureCode(buildOrderNo());
         failureDetailsDto.setSubmissionName(userInfo.getUserModel().getRealName());
-        failureDetailsDto.setBizCode(userInfo.getDepartment().getSequenceNbr());
+        failureDetailsDto.setBizCode(Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId())));
         model = this.createWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
@@ -234,7 +236,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Integer processAuditorId = model.getSubmissionPid();
         String processResult = "提交报修单";
         String processDepartment = userInfo.getDepartment().getDepartmentName();
-        Long departmentId = userInfo.getDepartment().getSequenceNbr();
+        Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
@@ -266,7 +268,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Integer processAuditorId = model.getSubmissionPid();
         String processResult = "重新提交报修单";
         String processDepartment = userInfo.getDepartment().getDepartmentName();
-        Long departmentId = userInfo.getDepartment().getSequenceNbr();
+        Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
@@ -396,6 +398,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
     public Map<String, Object> checkExcuteTaskAuthMap(Long sequenceNbr, ReginParams userInfo) {
         // 获取当前登录用户的角色
+
         String currentLoginUserRole = userInfo.getRole().getRoleName();
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("checkFlag", false);
@@ -404,7 +407,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
         FailureDetails details = this.baseMapper.selectById(sequenceNbr);
         String procressId = details.getProcessId();
-        Long seq = userInfo.getDepartment().getSequenceNbr();
+        Long seq = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
         JSONObject teskObject = workflowFeignService.getTaskList(procressId);
         if (ObjectUtils.isNotEmpty(teskObject)) {
             JSONArray taskDetailArray = teskObject.getJSONArray("data");

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

@@ -967,6 +967,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return this.queryBySeq(Long.valueOf(person.getParentId()));
     }
 
+    public String getParentId(String amosOrgId) {
+        List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId);
+        String parentId = null;
+        if (orgUsrDtos.size() >= 1){
+            parentId = orgUsrDtos.get(0).getParentId();
+        }else {
+            return null;
+        }
+        return parentId;
+    }
+
+
     public OrgUsrDto queryForListByParentIdAndOrgType(String amosOrgId) {
         return this.queryModelByParams(amosOrgId);
     }