修改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

@@ -141,14 +141,16 @@ public interface IOrgUsrService {
 
 	List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
 
-
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/20
 	 *         </PRE>
+	 * 
 	 *         列表
 	 */
 	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
@@ -156,10 +158,13 @@ public interface IOrgUsrService {
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/20
 	 *         </PRE>
+	 * 
 	 *         统计
 	 */
 	Integer listContractDtoCount(RequestData par);
@@ -167,7 +172,9 @@ public interface IOrgUsrService {
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/26
 	 *         </PRE>
@@ -186,7 +193,7 @@ public interface IOrgUsrService {
 	/**
 	 * 根据登陆人获取公司部门人员树
 	 */
-	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);    	 
+     }
+    
+    
+    
+    
 }