feat(jyjc)：新增获取用户所属组接口

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionEquipStatistics.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 设备检验检测统计表
  *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 业务开通申请表
  *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionEquipStatisticsModel.java

@@ -6,6 +6,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 设备检验检测统计表
  *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -6,6 +6,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 业务开通申请表
  *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +21,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -141,11 +149,22 @@ public class JyjcOpeningApplicationController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/restartFlow/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "重新提交开通申请", notes = "重新提交开通申请")
+	@PostMapping(value = "/startFlow/{sequenceNbr}")
+	@ApiOperation(httpMethod = "POST", value = "重新提交开通申请", notes = "重新提交开通申请")
 	public ResponseModel<JyjcOpeningApplicationModel> resubmitJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.updateModel(model, true));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUserRole")
+	@ApiOperation(httpMethod = "GET", value = "获取用户所属组", notes = "获取用户所属组")
+	public ResponseModel<List<Long>> getUserRole() {
+		AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId(RequestContext.getExeUserId()).getResult();
+		List<RoleModel> roleModels = userModel.getOrgRoles()
+											  .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+		List<Long> roleIds = roleModels.stream().map(RoleModel::getSequenceNbr).distinct().collect(Collectors.toList());
+		return ResponseHelper.buildResponse(roleIds);
+	}
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -101,20 +101,20 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     public JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model) {
         // 开启工作流 startProcess
         try {
-            String instanceId = startFlow();
-            JSONObject dataObject = getTask(instanceId);
-            JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-            if(!ValidationUtil.isEmpty(executorArray)) {
-                String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
-                model.setWorkflowRole(roleGroups);
-            }
+            // String instanceId = startFlow();
+            // JSONObject dataObject = getTask(instanceId);
+            // JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
+            // if(!ValidationUtil.isEmpty(executorArray)) {
+            //     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
+            //     model.setWorkflowRole(roleGroups);
+            // }
             CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
             model.setUnitCode(companyBo.getCompanyCode());
             model.setUnitCode("91611103MAC4Q1EG7B");
             model.setUnitCodeName(companyBo.getCompanyName());
             model.setApplicationSeq(buildApplicationSeq());
-            model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
-            model.setWorkflowProstanceId(instanceId);
+            // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
+            // model.setWorkflowProstanceId(instanceId);
             return this.createWithModel(model);
         } catch (Exception e) {
             log.error("saveModel: model={} error", model, e);