为表单页面提供人员接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -226,6 +226,25 @@ public class OrgPersonController extends BaseController {
                 requestBody));
     }
 
+    /**
+     * 根据当前登陆人获取站内所有人员信息 （表单使用）
+     *
+     * @return
+     */
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/listAllByCurrentUser", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询(表单用)", notes = "列表分页查询（表单用）")
+    public ResponseModel<Object> listAllByCurrentUser() {
+        Map<String, Object> req = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        req.put("bizOrgCode", bizOrgCode);
+        if(redisUtils.get("userList:" + bizOrgCode) != null){
+            return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
+        }
+        return ResponseHelper.buildResponse(iOrgUsrService.listAllByCurrentUser(null, null, req));
+    }
+
 
     @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getUserByCode/list", method = RequestMethod.GET)

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

@@ -57,6 +57,7 @@ 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.RoleModel;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -650,6 +651,115 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return pageBean;
 	}
 
+	public IPage<Map<String, Object>> listAllByCurrentUser(String pageNum, String pageSize, Map<String, Object> req) {
+		String bizOrgCode = req.get("bizOrgCode").toString();
+		IPage<Map<String, Object>> pageBean = null;
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		Map<String, Object> map = new HashMap<>();
+		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 开始 */
+		map.put("bizOrgType", OrgPersonEnum.人员.getKey());
+		if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) {
+			map.put("bizOrgName", req.get("bizOrgName"));
+		}
+		if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
+			map.put("personNumber", req.get("personNumber"));
+		}
+		if (req!=null&&req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
+			req.put("company", req.get("company"));
+		}
+
+		if (req!=null&&req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
+			LambdaQueryWrapper<OrgUsr> query = new LambdaQueryWrapper<>();
+			query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
+			OrgUsr orgUsr = this.getOne(query);
+			req.remove("bizOrgCode");
+			map.put("company", orgUsr.getSequenceNbr().toString());
+		}
+		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
+		if (!req.isEmpty()&&req.containsKey("parentId") && req.get("parentId") != null && req.get("parentId") != "") {
+			OrgUsr parent = this.getById(req.get("parentId").toString());
+			map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
+		}
+
+		// 新加
+		if (!ObjectUtils.isEmpty(req)&&req.containsKey("OrgCode") && req.get("OrgCode") != null && !req.get("OrgCode").equals("")) {
+			map.put("bizOrgCode", req.get("OrgCode"));
+			req.remove("OrgCode");
+		}
+
+		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
+		if (!req.isEmpty()&&req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
+			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
+		}
+
+		req.remove("bizOrgName");
+		req.remove("pageSize");
+		req.remove("pageNum");
+		req.remove("parentId");
+		req.remove("amosOrgId");
+		req.remove("company");
+		map.put("fieldsValue", req);
+		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
+		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
+		map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
+		map.put("pageSize", pageBean.getSize());
+		List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
+		//处理循环中的远程调用（原有逻辑不变）
+		List<String> amosIds = new ArrayList<>();
+		list.stream().forEach(t -> {
+			// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm
+			// 2021-09-16
+			if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {
+				amosIds.add(t.get("amosOrgId").toString());
+//				FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient
+//						.queryByUserId(t.get("amosOrgId").toString());
+//				if (null != result1.getResult()) {
+//					t.put("amosOrgCode", result1.getResult().getRealName());
+//				}
+				String chargePersonId = iOrgUsrService.getIdNumberByAmosId(t.get("amosOrgId").toString());
+				t.put("chargePersonId", chargePersonId);
+			} else {
+				t.put("chargePersonId", null);
+			}
+			if (!ObjectUtils.isEmpty(t.get("state"))) {
+				DataDictionary gwmc = dataDictionaryService.getByCode(t.get("state").toString(), "RYZT");
+				if (!ObjectUtils.isEmpty(gwmc)) {
+					t.put("stateName", gwmc.getName());
+				} else {
+					t.put("stateName", t.get("state"));
+				}
+			}
+
+		});
+		if (CollectionUtils.isNotEmpty(amosIds)) {
+			String join = String.join(",", amosIds);
+			List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(join, false).getResult();
+			Map<String, AgencyUserModel> collect = amosUser.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, t -> t));
+			list.stream().forEach(t -> {
+				if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString()) && collect.containsKey(t.get("amosOrgId").toString())) {
+					t.put("amosOrgCode", collect.get(t.get("amosOrgId").toString()).getRealName());
+				}
+			});
+		}
+		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
+		pageBean.setRecords(list);
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DAY_OF_YEAR,1);
+		calendar.set(Calendar.HOUR_OF_DAY,0);
+		calendar.set(Calendar.SECOND,0);
+		calendar.set(Calendar.MINUTE,0);
+		calendar.set(Calendar.MILLISECOND,0);
+		//当前时间与晚上十二点的秒差
+		Long timeOut = (calendar.getTimeInMillis()-System.currentTimeMillis()) / 1000;
+		redisUtils.set("userList:" + bizOrgCode, pageBean, timeOut);
+		return pageBean;
+	}
+
 	@Override
 	public List<FormValue> getFormValue(Long id) {
 		// 动态表单数据