1.转办bug修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,6 @@ public interface JyjcBaseMapper {
      * @return  List<TzsUserInfoDto>
      */
     List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
+
+    CompanyModel selectOneCompanyByCode(String companyCode);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml

@@ -68,6 +68,37 @@
         </foreach>
             GROUP BY c.company_code
     </select>
+    <select id="selectUserByCompanyCodeAndRole" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
+
+         select
+			a.user_id as amos_user_id,
+			b.real_name as name
+		from
+            (SELECT
+            DISTINCT u.user_id
+            FROM
+            "privilege_user_org_role" u,
+            "privilege_company" c
+            WHERE
+            u.company_seq = c.sequence_nbr
+            and c.company_code =#{companyCode}
+            and u.role_seq in
+            <foreach collection="roleSeqs" item="roleSeq" open="(" close=")" separator=",">
+                #{roleSeq}
+            </foreach>) as a,
+            privilege_agency_user  b
+		where
+		a.user_id = b.user_id
+
+    </select>
+    <select id="selectOneCompanyByCode" resultType="com.yeejoin.amos.feign.privilege.model.CompanyModel">
+        SELECT
+           c.*
+        FROM
+            "privilege_company" c
+        WHERE
+             c.company_code =#{companyCode}
+    </select>
 
 
 </mapper>

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
@@ -180,4 +181,12 @@ public class CommonController extends BaseController {
         regularlyRemindJob.sendReminderMessage();
         return ResponseHelper.buildResponse("succese");
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "amos/{unitCode}/users")
+    @ApiOperation(httpMethod = "GET", value = "查询指定公司、指定人员类型的人员列表", notes = "查询指定公司、指定人员类型的人员列表")
+    public ResponseModel<List<AgencyUserModel>> getAmosUseListByCompanyCode(@ApiParam(value = "公司编码") @PathVariable String unitCode) {
+        return ResponseHelper.buildResponse(commonserviceImpl.getAmosUseListByCompanyCode(unitCode));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/InspectionExpireRemindJob.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.NeedTipEquipInfo;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -50,18 +49,14 @@ public class InspectionExpireRemindJob {
     private UseInfoMapper useInfoMapper;
 
 
-    private TzsUserInfoMapper tzsUserInfoMapper;
-
     private AmosRequestContext amosRequestContext;
 
     private JyjcBaseMapper jyjcBaseMapper;
 
     public InspectionExpireRemindJob(UseInfoMapper useInfoMapper,
-                                     TzsUserInfoMapper tzsUserInfoMapper,
                                      AmosRequestContext amosRequestContext,
                                      JyjcBaseMapper jyjcBaseMapper) {
         this.useInfoMapper = useInfoMapper;
-        this.tzsUserInfoMapper = tzsUserInfoMapper;
         this.amosRequestContext = amosRequestContext;
         this.jyjcBaseMapper = jyjcBaseMapper;
     }

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/CommonServiceImpl.java

@@ -9,12 +9,17 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.InstanceRuntimeData;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
+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.CompanyModel;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +59,9 @@ public class CommonServiceImpl {
     @Autowired
     RedissonClient redissonClient;
 
+    @Autowired
+    JyjcBaseMapper jyjcBaseMapper;
+
 
     /**
      * @return ReginParams
@@ -185,4 +193,10 @@ public class CommonServiceImpl {
             throw new BadRequest("无权限执行该任务");
         }
     }
+
+    public List<AgencyUserModel> getAmosUseListByCompanyCode(String unitCode) {
+        CompanyModel companyModel = jyjcBaseMapper.selectOneCompanyByCode(unitCode);
+        FeignClientResult<List<AgencyUserModel>> result = Privilege.agencyUserClient.queryByCompanyId(companyModel.getSequenceNbr(), null, null, false);
+        return result.getResult();
+    }
 }