今日值班接口修改不用appKey隔离

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -76,7 +76,6 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
      * @param dutyDay    值班日期
      * @param shiftIds    班次id
      * @param fieldCodes 动态列
-     * @param appKey     应用标识
      * @param groupCode 表单类型
      * @return List<Map < String, Object>>
      */
@@ -84,6 +83,5 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
             @Param("dutyDate") String dutyDay,
             @Param("shiftId") String shiftIds,
             @Param("fieldCodes") Map<String, Object> fieldCodes,
-            @Param("appKey") String appKey,
             @Param("groupCode") String groupCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -162,7 +162,6 @@
         from
         cb_dynamic_form_instance i
         where i.GROUP_CODE = #{groupCode}
-        and i.APP_KEY = #{appKey}
         GROUP by
         i.INSTANCE_ID ) d,
         cb_duty_person_shift ps,

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

@@ -149,9 +149,8 @@ public class DutyPersonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("查询当前值班人信息列表")
     @GetMapping("/person/on_duty/list")
-    public ResponseModel listOnDutyPerson(HttpServletRequest request) {
-        String appKey = request.getHeader("appKey");
-        return ResponseHelper.buildResponse(iDutyPersonService.listOnDutyPerson(appKey));
+    public ResponseModel listOnDutyPerson() {
+        return ResponseHelper.buildResponse(iDutyPersonService.listOnDutyPerson());
     }
 
 

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

@@ -78,5 +78,5 @@ public interface IDutyCommonService {
      *
      * @return List<Map < String, Object>>
      */
-    List<Map<String, Object>> listOnDutyPerson(String appKey);
+    List<Map<String, Object>> listOnDutyPerson();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -186,9 +186,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
             String userId = d.get("userId").toString();
             List<DynamicFormInstance> instances =
                     dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>()
-                    .eq(DynamicFormInstance::getFieldCode, "userId")
-                    .eq(DynamicFormInstance::getFieldValue, userId)
-                    .eq(DynamicFormInstance::getGroupCode, this.getGroupCode()));
+                            .eq(DynamicFormInstance::getFieldCode, "userId")
+                            .eq(DynamicFormInstance::getFieldValue, userId)
+                            .eq(DynamicFormInstance::getGroupCode, this.getGroupCode()));
             Long instanceId = null;
             List<DynamicFormColumn> columns =
                     dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, this.getGroupCode()));
@@ -300,11 +300,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     }
 
     @Override
-    public List<Map<String, Object>> listOnDutyPerson(String appKey) {
+    public List<Map<String, Object>> listOnDutyPerson() {
         String groupCode = this.getGroupCode();
         // 获取当前班次列表
         DateTime now = new DateTime();
-        List<Long> shiftIdList = getOnDuty(now, appKey);
+        List<Long> shiftIdList = getOnDuty(now);
         String shiftIds = StringUtils.join(shiftIdList.toArray(), ",");
         String dutyDay = now.toString("yyyy-MM-dd");
         // 获取当前值班人员
@@ -312,7 +312,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
                 dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().listOnDutyPerson(dutyDay,
-                shiftIds, fieldCodes, RequestContext.getAppKey(), groupCode);
+                shiftIds, fieldCodes, groupCode);
         // 获取人员照片和电话
         List<Long> ids = new ArrayList<>();
         maps.forEach(item -> ids.add(Long.valueOf(String.valueOf(item.get("userId")))));
@@ -334,8 +334,8 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
         return maps;
     }
 
-    private List<Long> getOnDuty(DateTime now, String appKey) {
-        List<DutyShiftDto> dutyShiftDtos = dutyShiftService.queryForDutyShiftList(appKey, false);
+    private List<Long> getOnDuty(DateTime now) {
+        List<DutyShiftDto> dutyShiftDtos = dutyShiftService.queryForDutyShiftList(false);
         List<Long> shiftIds = new ArrayList<>();
         int hour = now.getHourOfDay();
         int minute = now.getMinuteOfHour();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

@@ -31,4 +31,8 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D
     public List<DutyShiftDto> queryForDutyShiftList(String appKey, Boolean isDelete) {
         return this.queryForList("", false, appKey, isDelete);
     }
+
+    public List<DutyShiftDto> queryForDutyShiftList(Boolean isDelete) {
+        return this.queryForList("", false, isDelete);
+    }
 }