今日值班列表查询接口

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

@@ -137,7 +137,8 @@
         d.*,
         ps.shift_id as shiftId,
         ps.duty_date as dutyDate,
-        ds.name as shiftName
+        ds.name as shiftName,
+        '在岗' state
         from
         (
         select

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

@@ -324,7 +324,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
                     if (userId.equals(String.valueOf(usr.get("sequenceNbr")))) {
                         item.put("personImg", usr.get("personImg"));
                         item.put("telephone", usr.get("telephone"));
-                        orgUsrList.remove(usr);
+                        break;
                     }
                 }
             });

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

@@ -4,15 +4,11 @@ import java.util.Arrays;
 
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -157,7 +153,8 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
     public ResponseModel<PowerTransferSimpleDto> list(@PathVariable String alert_called_id) {
-        PowerTransferSimpleDto powerTransferSimpleDto = powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
+        PowerTransferSimpleDto powerTransferSimpleDto =
+                powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
         return ResponseHelper.buildResponse(powerTransferSimpleDto);
     }
 
@@ -187,5 +184,15 @@ public class PowerTransferController extends BaseController {
     public ResponseModel<Object> getPowerTree() {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTree());
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/power/list")
+    @ApiOperation(value = "力量出动列表", notes = "力量调派资源树")
+    public ResponseModel<Object> getPowerTransferList(@ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+                                                      @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerTransferList(beginDate, endDate));
+    }
+
+
 }
 

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

@@ -126,7 +126,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).filter(car ->
                         FireCarStatusEnum.执勤.getCode().equals(car.get("carState")) //TODO 后续如果需要多个状态需要删掉这个过滤条件
                                 || FireCarStatusEnum.出动.getCode().equals(car.get("carState"))).forEach(car -> {
-                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car, FireBrigadeResourceDto.class);
+                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car,
+                            FireBrigadeResourceDto.class);
                     // TODO 后期根据车物联状态来返回，现在为"在位=执勤","执勤=出动"
                     if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
                         fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
@@ -151,7 +152,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                         FireBrigadeResourceDto fireCarResourceDto = new FireBrigadeResourceDto();
                         List<FireBrigadeResourceDto> fireBrigadeResourceDtoList =
                                 resultMap.get(brigade.getSequenceNbr().toString());
-                        long onDutyCarCount = fireBrigadeResourceDtoList.stream().filter(car -> FireCarStatusEnum.执勤.getCode().equals(car.getCarState())).count();
+                        long onDutyCarCount =
+                                fireBrigadeResourceDtoList.stream().filter(car -> FireCarStatusEnum.执勤.getCode().equals(car.getCarState())).count();
                         long outCarCount = fireBrigadeResourceDtoList.size() - onDutyCarCount;
                         fireCarResourceDto.setId(brigade.getSequenceNbr().toString());
                         fireCarResourceDto.setType(FireBrigadeTypeEnum.专职消防队.getKey());
@@ -270,4 +272,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     public List<String> queryTransferCarIdsByAlertCalledId(Long alertCalledId) {
         return this.baseMapper.queryTransferCarIdsByAlertCalledId(alertCalledId);
     }
+
+    public Map<String, Object> getPowerTransferList(String beginDate, String endDate) {
+
+
+        return null;
+    }
 }