更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -97,4 +98,6 @@ public class JgUseRegistrationDto  extends BaseDto {
     private String equCode;
 
 
+ private List<String> roleIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgUseRegistrationDto dto);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgUseRegistrationDto dto , @Param("roleIds") List<String> roleIds);
 
     Map<String, Object> getDetail(@Param("id")String id);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -37,6 +37,11 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
+        <if test="roleIds != null">
+            <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                instance_status like #{role}
+            </foreach>
+        </if>
         </where>
             order by ur.rec_date desc
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -5,16 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -88,7 +93,7 @@ public class JgUseRegistrationController extends BaseController {
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page));
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page,  dto.getRoleIds()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -123,4 +128,16 @@ public class JgUseRegistrationController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人角色", notes = "查询当前登录人角色")
+    @GetMapping(value = "/getRole")
+    public ResponseModel<Object> getRole() {
+        HashMap<String, Object> map = new HashMap<>();
+        Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
+        List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
+        String roleIds = String.join(",", userOrgRoleList);
+        map.put("roleIds", roleIds);
+        return ResponseHelper.buildResponse(map);
+    }
+
 }

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

@@ -7,14 +7,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRelationEquip;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
@@ -55,14 +52,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private OtherInfoMapper otherInfoMapper;
     @Autowired
-    private JgRelationEquipMapper jgRelationEquipMapper;
+    private JgUseRegistrationEqMapper jgRelationEquipMapper;
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
     private ICreateCodeService iCreateCodeService;
 
-    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page) {
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto);
+    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page ,List<String> roleIds) {
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
     }
 
@@ -103,15 +100,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } else {
 
             // 业务管理设备信息保存
-            JgRelationEquip jgRelationEquip = new JgRelationEquip();
-            jgRelationEquip.setEquipId(map.get("equipId").toString());
-            jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
+            JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
+            jgRelationEquip.setEquId(map.get("equipId").toString());
+//            jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
             List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgUseRegistration.setApplyNo(applicationFormCode.get(0));
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(UseStatusEnum.SUBMIT.getPass());
             this.save(jgUseRegistration);
-            jgRelationEquip.setBusinessId(jgUseRegistration.getSequenceNbr().toString());
+//            jgRelationEquip.setBusinessId(jgUseRegistration.getSequenceNbr().toString());
             jgRelationEquipMapper.insert(jgRelationEquip);
         }