联动单位-救援装备

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.java

@@ -25,10 +25,13 @@ public class RescueEquipmentDto  extends BaseDto {
     private String vehicleType;
 
     @ApiModelProperty(value = "车辆类型code")
-    private String vehicleCode;
+    private String vehicleTypeCode;
 
-    @ApiModelProperty(value = "人数")
-    private Long personNumber;
+    @ApiModelProperty(value = "车辆数量")
+    private Long vehicleNumber;
+
+    @ApiModelProperty(value = "费用")
+    private Integer fee;
 
     @ApiModelProperty(value = "单位名称")
     private String company;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/RescueEquipment.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -25,31 +26,37 @@ public class RescueEquipment extends BaseEntity {
     /**
      * 车辆类型
      */
-	@TableField("vehicle_type")
+    @TableField("vehicle_type")
     private String vehicleType;
 
     /**
      * 车辆类型code
      */
-	@TableField("vehicle_code")
-    private String vehicleCode;
+    @TableField("vehicle_type_code")
+    private String vehicleTypeCode;
 
     /**
      * 人数
      */
-	@TableField("person_number")
-    private Long personNumber;
+    @TableField("vehicle_number")
+    private Long vehicleNumber;
+
+    /**
+     * 费用
+     */
+    @TableField("fee")
+    private Integer fee;
 
     /**
      * 单位名称
      */
-	@TableField("company")
+    @TableField("company")
     private String company;
 
     /**
      * 单位id
      */
-	@TableField("company_id")
+    @TableField("company_id")
     private Long companyId;
 
 }

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 救援装备 Mapper 接口
  *
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface RescueEquipmentMapper extends BaseMapper<RescueEquipment> {
 
+    List<Long> getVehicleCodeCodeList(boolean isDelete);
 }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.RescueEquipmentMapper">
 
+    <select id="getVehicleCodeCodeList" resultType="java.lang.Long">
+        select distinct vehicle_type_code
+        from cb_rescue_equipment
+        where is_delete = #{isDelete}
+    </select>
 </mapper>

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

@@ -5,12 +5,17 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
 import java.util.List;
+
 import com.yeejoin.amos.boot.module.common.biz.service.impl.RescueEquipmentServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
@@ -37,28 +42,29 @@ public class RescueEquipmentController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增救援装备", notes = "新增救援装备")
-	public ResponseModel<RescueEquipmentDto> save(@RequestBody RescueEquipmentDto model) {
-	    model = rescueEquipmentServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增救援装备", notes = "新增救援装备")
+    public ResponseModel<RescueEquipmentDto> save(@RequestBody RescueEquipmentDto model) {
+        model = rescueEquipmentServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
-	/**
+    /**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新救援装备", notes = "根据sequenceNbr更新救援装备")
-	public ResponseModel<RescueEquipmentDto> updateBySequenceNbrRescueEquipment(@RequestBody RescueEquipmentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.updateWithModel(model));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新救援装备", notes = "根据sequenceNbr更新救援装备")
+    public ResponseModel<RescueEquipmentDto> updateBySequenceNbrRescueEquipment(@RequestBody RescueEquipmentDto model
+            , @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.updateWithModel(model));
+    }
 
-	/**
+    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -67,50 +73,77 @@ public class RescueEquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除救援装备", notes = "根据sequenceNbr删除救援装备")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个救援装备",  notes = "根据sequenceNbr查询单个救援装备")
-	public ResponseModel<RescueEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryBySeq(sequenceNbr));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个救援装备", notes = "根据sequenceNbr查询单个救援装备")
+    public ResponseModel<RescueEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryBySeq(sequenceNbr));
+    }
 
-	/**
+    /**
      * 列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "救援装备分页查询",  notes = "救援装备分页查询")
-	public ResponseModel<Page<RescueEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<RescueEquipmentDto> page = new Page<RescueEquipmentDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "救援装备分页查询", notes = "救援装备分页查询")
+    public ResponseModel<Page<RescueEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                                @RequestParam(value = "size") int size,
+                                                                String vehicleCode) {
+        Page<RescueEquipmentDto> page = new Page<RescueEquipmentDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, vehicleCode));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "救援装备列表全部数据查询", notes = "救援装备列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RescueEquipmentDto>> selectForList() {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentList());
+    }
 
-	/**
-	 * 列表全部数据查询
+    /**
+     * 批量删除救援装备
      *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "救援装备列表全部数据查询",   notes = "救援装备列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<RescueEquipmentDto>> selectForList() {
-	    return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentList());
-	}
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除合同信息", notes = "批量删除合同信息")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
+     * 查询没有数据的岗位类型
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询没有数据的岗位类型", notes = "查询没有数据的岗位类型")
+    @GetMapping(value = "/vehicle_list")
+    public ResponseModel<HashMap<Object, Object>> getRescueEquipmentList() throws Exception {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.getRescueEquipmentList());
+    }
 }

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

@@ -101,12 +101,13 @@ public class SpecialPositionStaffController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "特岗人员分页查询", notes = "特岗人员分页查询")
     public ResponseModel<Page<SpecialPositionStaffDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                                     @RequestParam
-                                                                             (value = "size") int size) {
+                                                                     @RequestParam(value = "size") int size,
+                                                                     String positionNameCode) {
         Page<SpecialPositionStaffDto> page = new Page<SpecialPositionStaffDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryForSpecialPositionStaffPage(page));
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryForSpecialPositionStaffPage(page,
+                positionNameCode));
     }
 
     /**

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
+import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
 import com.yeejoin.amos.boot.module.common.api.mapper.RescueEquipmentMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IRescueEquipmentService;
 import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -16,18 +24,56 @@ import java.util.List;
  * @date 2021-07-23
  */
 @Service
-public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto,RescueEquipment,RescueEquipmentMapper> implements IRescueEquipmentService {
+public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto, RescueEquipment,
+        RescueEquipmentMapper> implements IRescueEquipmentService {
+
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+
     /**
      * 分页查询
      */
-    public Page<RescueEquipmentDto> queryForRescueEquipmentPage(Page<RescueEquipmentDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<RescueEquipmentDto> queryForRescueEquipmentPage(Page<RescueEquipmentDto> page,
+                                                                @Condition(Operator.eq) String vehicleCode) {
+        return this.queryForPage(page, null, false, vehicleCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<RescueEquipmentDto> queryForRescueEquipmentList()   {
-        return this.queryForList("" , false);
+    public List<RescueEquipmentDto> queryForRescueEquipmentList() {
+        return this.queryForList("", false);
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrList
+     * @return
+     */
+    public Boolean batchDelete(List<Long> sequenceNbrList) {
+        List<RescueEquipment> positionStaffList =
+                list(new LambdaQueryWrapper<RescueEquipment>().in(RescueEquipment::getSequenceNbr,
+                        sequenceNbrList));
+        positionStaffList.forEach(item -> item.setIsDelete(true));
+        boolean update = updateBatchById(positionStaffList);
+        return update;
+    }
+
+    public HashMap<Object, Object> getRescueEquipmentList() throws Exception {
+        // 查询所有岗位类型
+        List<MenuFrom> menuList = dataDictionaryService.getGWMCDataDictionary("JYZBLX");
+        // 查询已有数据的岗位类型
+        List<Long> vehicleCodeCodeList = this.baseMapper.getVehicleCodeCodeList(false);
+        // 排除已有数据的，返回
+        for (int i = 0; i < menuList.size(); i++) {
+            if (vehicleCodeCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {
+                menuList.remove(i);
+                i--;
+            }
+        }
+        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("JYZBLX", menuList);
+        return objectObjectHashMap;
     }
 }
\ No newline at end of file

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

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.common.api.mapper.SpecialPositionStaffMapper
 import com.yeejoin.amos.boot.module.common.api.service.ISpecialPositionStaffService;
 import com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,8 +32,9 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
     /**
      * 分页查询
      */
-    public Page<SpecialPositionStaffDto> queryForSpecialPositionStaffPage(Page<SpecialPositionStaffDto> page) {
-        return this.queryForPage(page, null, false);
+    public Page<SpecialPositionStaffDto> queryForSpecialPositionStaffPage(Page<SpecialPositionStaffDto> page,
+                                                                          @Condition(Operator.eq) String positionNameCode) {
+        return this.queryForPage(page, null, false, positionNameCode);
     }
 
     /**