增加人员列表查询

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -10,7 +10,7 @@
         WHERE
         1=1
         <if test="biz_org_code != null and biz_org_code != ''">
-        and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE biz_org_code = #{biz_org_code} limit 1)
+        and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE biz_org_code = #{biz_org_code} and is_delete = 0 limit 1)
         </if>
 
     </select>

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -88,20 +89,15 @@ public class OrgPersonController {
 		return ResponseHelper.buildResponse(null);
 	}
 
+
 	/**
-	 * 根据id查询人员
 	 *
+	 * @param request
 	 * @param id
 	 * @return
+	 * @throws Exception
 	 */
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
-	public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
-		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonById(id));
-	}
-	
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}/detail", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
 	public ResponseModel selectByIdDetail(HttpServletRequest request, @PathVariable Long id) throws Exception {
@@ -116,7 +112,7 @@ public class OrgPersonController {
 	 */
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/show/{id}", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+	@ApiOperation(httpMethod = "GET", value = "获取人员详情(map类型)", notes = "获取人员详情")
 	public ResponseModel selectForShowById(HttpServletRequest request, @PathVariable Long id) throws Exception {
 		OrgUsr orgUsr = iOrgUsrService.getById(id);
 		Map<String, Object> result = iOrgUsrService.selectForShowById(orgUsr, id);
@@ -194,4 +190,23 @@ public class OrgPersonController {
 		iOrgUsrService.savePersonList(OrgPersonVo);
 		return ResponseHelper.buildResponse(null);
 	}
+
+	/**
+	 * 根据id查询人员
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/showPersonList/{ids}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取人员列表详情(map类型)", notes = "获取人员详情")
+	public ResponseModel selectForShowByListId(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
+		List<Map<String, Object>> personResult = new ArrayList<>();
+		for (int i = 0; i < ids.size(); i++) {
+			OrgUsr orgUsr = iOrgUsrService.getById(ids.get(i));
+			Map<String, Object> result = iOrgUsrService.selectForShowById(orgUsr, ids.get(i));
+			personResult.add(result);
+		}
+		return ResponseHelper.buildResponse(personResult);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormServiceImpl.java

@@ -45,7 +45,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 		for (AlertForm alertFrom : alertFormValue) {
 			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
 				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
-						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getIsBlock()));
+						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock()));
 				listfrom.add(vo);				
 			}else {
 				// 查询数据项				
@@ -54,7 +54,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 				 queryWrappercolumnMap.orderByAsc("sort_num");
 				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.list(queryWrappercolumnMap);
 				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
-				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getIsBlock()));
+				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock()));
 				listfrom.add(vo);				
 			}
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
@@ -54,6 +55,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     AlertFormServiceImpl alertFormServiceImpl;
     @Autowired
     AlertFormValueServiceImpl iAlertFromValueService;
+    @Autowired
+    AlertFormServiceImpl iAlertFormServiceImpl;
 
     @Override
     public String selectUpUnitByParam(String biz_org_code) {
@@ -388,14 +391,20 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception {
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("alert_called_id", id);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("alert_type_code",246);
+        List<AlertForm> alertForms = iAlertFormServiceImpl.list(queryWrapper);
         // 动态表单数据
         List<AlertFormValueVo> list = iAlertFromValueService.listByCalledId(id);
         List<FormValue> formValue = new ArrayList();
-        Map<String, Object> result = Bean.BeantoMap(orgUsr);
+        Map<String, Object> result = new HashMap<>();
+        result = Bean.BeantoMap(orgUsr);
+        // 放入所有动态表单数据
+        for (AlertForm alertForm : alertForms) {
+            result.put(alertForm.getFieldCode(), null);
+        }
         for (AlertFormValueVo alertFormValue : list) {
-            result.put(alertFormValue.getFieldCode(), alertFormValue.getFieldValue());
+            result.replace(alertFormValue.getFieldCode(), alertFormValue.getFieldValue());
         }
         return result;
     }
@@ -418,7 +427,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-        saveOrgUsrAlertFormValue(orgUsr,OrgPersonVo.getAlertFormValue());
+        saveOrgUsrAlertFormValue(orgUsr, OrgPersonVo.getAlertFormValue());
     }
 
     @Override
@@ -438,9 +447,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
-        saveOrgUsr(oriOrgUsr,id);
+        saveOrgUsr(oriOrgUsr, id);
         // 保存动态表单数据
-        updateAlertFormValue(oriOrgUsr,orgUsr.getSequenceNbr(),OrgPersonVo.getAlertFormValue());
+        updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getAlertFormValue());
     }
 
     @Override
@@ -491,7 +500,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             OrgUsr orgUsr = new OrgUsr();
             BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr);
             orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-            saveOrgUsrAlertFormValue(orgUsr,OrgUsrVo.get(i).getAlertFormValue());
+            saveOrgUsrAlertFormValue(orgUsr, OrgUsrVo.get(i).getAlertFormValue());
         }
     }
 
@@ -503,7 +512,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
         orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
-        return  orgPersonFormVo;
+        return orgPersonFormVo;
     }
 
     @Override
@@ -524,7 +533,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
         Collection<OrgUsr> list = listByMap(columnMap);
-         return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+        return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
     }
 
 
@@ -534,7 +543,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             OrgUsr orgUsr = new OrgUsr();
             BeanUtils.copyProperties(OrgPersonVo.get(i), orgUsr);
             orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-            saveOrgUsrAlertFormValue(orgUsr,OrgPersonVo.get(i).getAlertFormValue());
+            saveOrgUsrAlertFormValue(orgUsr, OrgPersonVo.get(i).getAlertFormValue());
         }
     }
 
@@ -543,7 +552,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-        saveOrgUsrAlertFormValue(orgUsr,OrgDepartmentVo.getAlertFormValue());
+        saveOrgUsrAlertFormValue(orgUsr, OrgDepartmentVo.getAlertFormValue());
     }
 
     @Override
@@ -552,9 +561,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
-        saveOrgUsr(oriOrgUsr,id);
+        saveOrgUsr(oriOrgUsr, id);
         // 保存动态表单数据
-        updateAlertFormValue(oriOrgUsr,orgUsr.getSequenceNbr(),OrgDepartmentVo.getAlertFormValue());
+        updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getAlertFormValue());
     }
 
     @Override
@@ -564,6 +573,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = getFormValue(id);
         OrgDepartmentFormVo orgDepartmentFormVo = new OrgDepartmentFormVo(formValue);
         BeanUtils.copyProperties(orgUsr, orgDepartmentFormVo);
-        return  orgDepartmentFormVo;
+        return orgDepartmentFormVo;
     }
 }