修改bug 2472

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCommonService.java

@@ -37,7 +37,7 @@ public interface IDutyCommonService {
      * @param endDate   结束日期
      * @return ResponseModel
      */
-    List<Map<String, Object>> list(String beginDate, String endDate) throws ParseException;
+    List<Map<String, Object>> list(Long teamId,String beginDate, String endDate) throws ParseException;
 
     /**
      * 获取表单参数

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -16,177 +16,184 @@ import java.util.Map;
  * @date 2021-06-18
  */
 public interface IOrgUsrService {
-    /**
-     * 查询上级单位
-     *
-     * @param parent_id
-     * @return
-     */
-    String selectUpUnitByParam(String parent_id);
-
-    /**
-     * 获取父级
-     *
-     * @param topId
-     * @param entityList
-     * @param packageURL
-     * @param IDMethodName
-     * @param IDHierarchy
-     * @param NAMEMethodName
-     * @param PARENTIDMethodName
-     * @param OrgTypeMethodName
-     * @return
-     * @throws Exception
-     */
-    List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-                             String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
-
-    /**
-     * 获取子数据集合
-     *
-     * @param topId
-     * @param entityList
-     * @param packageURL
-     * @param IDMethodName
-     * @param IDHierarchy
-     * @param NAMEMethodName
-     * @param PARENTIDMethodName
-     * @param OrgTypeMethodName
-     * @return
-     * @throws Exception
-     */
-    List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-                            String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
-
-    /**
-     * 组装融合调度单位人员信息
-     *
-     * @param ids
-     * @return
-     * @throws Exception
-     */
-    List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
-
-    /**
-     * 获取动态表单数据
-     *
-     * @param id
-     * @return
-     * @throws Exception
-     */
-    List<FormValue> getFormValue(Long id) throws Exception;
-
-    /**
-     * 保存 机构/部门/人员基本信息
-     *
-     * @param
-     * @throws Exception
-     */
-    void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
-
-    /**
-     * 新增机构/部门/人员基本信息和动态表单数据
-     *
-     * @param orgUsr
-     * @param alertFromValuelist
-     */
-    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
-
-    /**
-     * 更新机构/部门/人员基本信息和动态表单数据
-     *
-     * @param instanceId    实例id
-     * @param fromValueList 动态表单数据列表
-     * @throws Exception
-     */
-    void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
-
-    /**
-     * @param id
-     * @throws Exception
-     */
-    Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
-
-    List<OrgUsr> selectCompanyDepartmentMsg();
-
-    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
-
-    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
-
-    void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
-
-    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
-
-    OrgUsrFormDto selectCompanyById(Long id) throws Exception;
-
-    IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
-
-    void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
-
-    void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
-
-    OrgPersonFormDto selectPersonById(Long id) throws Exception;
-
-    OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
-
-    List<OrgMenuDto> selectPersonTree() throws Exception;
-
-    void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
-
-    void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
-
-    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
-
-    OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
-
-    List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
-
-
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/20
-     * </PRE>
-     * 列表
-     */
-    List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
+	/**
+	 * 查询上级单位
+	 *
+	 * @param parent_id
+	 * @return
+	 */
+	String selectUpUnitByParam(String parent_id);
 
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/20
-     * </PRE>
-     * 统计
-     */
-    Integer listContractDtoCount(RequestData par);
+	/**
+	 * 获取父级
+	 *
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
+	List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/26
-     * </PRE>
-     */
+	/**
+	 * 获取子数据集合
+	 *
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
+	List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
-    List<OrgUsrzhDto> getOrgUsrzhDto(String name);
+	/**
+	 * 组装融合调度单位人员信息
+	 *
+	 * @param ids
+	 * @return
+	 * @throws Exception
+	 */
+	List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
 
-    List<ESOrgUsrDto> selectByIddata(String name);
+	/**
+	 * 获取动态表单数据
+	 *
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	List<FormValue> getFormValue(Long id) throws Exception;
 
-    List<Map<String, Object>> getparent();
+	/**
+	 * 保存 机构/部门/人员基本信息
+	 *
+	 * @param
+	 * @throws Exception
+	 */
+	void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
 
-    List<OrgUsrExcelDto> exportToExcel();
+	/**
+	 * 新增机构/部门/人员基本信息和动态表单数据
+	 *
+	 * @param orgUsr
+	 * @param alertFromValuelist
+	 */
+	void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
 
-    UserUnitDto getUserUnit(String userId);
+	/**
+	 * 更新机构/部门/人员基本信息和动态表单数据
+	 *
+	 * @param instanceId    实例id
+	 * @param fromValueList 动态表单数据列表
+	 * @throws Exception
+	 */
+	void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
+
+	/**
+	 * @param id
+	 * @throws Exception
+	 */
+	Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
+
+	List<OrgUsr> selectCompanyDepartmentMsg();
+
+	void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
+
+	void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
+
+	void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
+
+	void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
+
+	OrgUsrFormDto selectCompanyById(Long id) throws Exception;
+
+	IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
+
+	void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
+
+	void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
+
+	OrgPersonFormDto selectPersonById(Long id) throws Exception;
+
+	OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
+
+	List<OrgMenuDto> selectPersonTree() throws Exception;
+
+	void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
+
+	void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
+
+	void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
+
+	OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
+
+	List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
+
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 *         </PRE>
+	 * 
+	 *         列表
+	 */
+	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
+
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 *         </PRE>
+	 * 
+	 *         统计
+	 */
+	Integer listContractDtoCount(RequestData par);
+
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/26
+	 *         </PRE>
+	 */
+
+	List<OrgUsrzhDto> getOrgUsrzhDto(String name);
+
+	List<ESOrgUsrDto> selectByIddata(String name);
+
+	List<Map<String, Object>> getparent();
+
+	List<OrgUsrExcelDto> exportToExcel();
+
+	UserUnitDto getUserUnit(String userId);
 
 	/**
 	 * 根据登陆人获取公司部门人员树
 	 */
-	List<OrgMenuDto> companyUserTreeByUser (AgencyUserModel user);
+	List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user);
 
 	/**
 	 * 根据登陆人获取公司部门树
@@ -198,4 +205,6 @@ public interface IOrgUsrService {
 	 */
 	List<OrgUsrTreeDto> companyListByUser(AgencyUserModel user);
 
+	List<OrgUsr> getPersonListByParentId(Long id);
+
 }

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

@@ -61,8 +61,9 @@ public class DutyPersonController extends BaseController {
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
     public ResponseModel list(@ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
-                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
-        return ResponseHelper.buildResponse(iDutyPersonService.list(beginDate, endDate));
+                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+                             @RequestParam(required = false) Long teamId) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyPersonService.list(teamId,beginDate, endDate));
     }
 
 

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

@@ -20,6 +20,9 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+import net.bytebuddy.asm.Advice.This;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1294,6 +1297,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return pid;
     }
 
+    /**
+     * 查询组织机构下面的人员信息
+     * @param id
+     * @return
+     */
+     public  List<OrgUsr> getPersonListByParentId(Long id) {
+    	 LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+    	 wrapper.eq(OrgUsr::getIsDelete, false);
+    	 wrapper.eq(OrgUsr::getParentId,id);
+    	 wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+    	 return this.baseMapper.selectList(wrapper);    	 
+     }
+    
+    
+    
+    
 }