Commit 38c8e8b9 authored by suhuiguang's avatar suhuiguang

1.增加orgCode 数据过滤使用

parent e2860535
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
/** /**
* 动态表单树形分组字段表 * 动态表单树形分组字段表
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="DynamicFormColumnDto", description="动态表单树形分组字段表") @ApiModel(value = "DynamicFormColumnDto", description = "动态表单树形分组字段表")
public class DynamicFormColumnDto extends BaseDto { public class DynamicFormColumnDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "字段名") @ApiModelProperty(value = "字段名")
...@@ -54,9 +53,11 @@ public class DynamicFormColumnDto extends BaseDto { ...@@ -54,9 +53,11 @@ public class DynamicFormColumnDto extends BaseDto {
@ApiModelProperty(value = "提示信息") @ApiModelProperty(value = "提示信息")
private String remark; private String remark;
//新加排序字段
@ApiModelProperty(value = "排序字段") @ApiModelProperty(value = "排序字段")
private int sort; private int sort;
@ApiModelProperty(value = "组织机构")
private String orgCode;
} }
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
/** /**
...@@ -18,8 +18,6 @@ public class DynamicFormGroupDto extends BaseDto { ...@@ -18,8 +18,6 @@ public class DynamicFormGroupDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "分组名称") @ApiModelProperty(value = "分组名称")
private String groupName; private String groupName;
......
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
/** /**
* 动态表单实例表 * 动态表单实例表
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="DynamicFormInstanceDto", description="动态表单实例表") @ApiModel(value = "DynamicFormInstanceDto", description = "动态表单实例表")
public class DynamicFormInstanceDto extends BaseDto { public class DynamicFormInstanceDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "字段名") @ApiModelProperty(value = "字段名")
...@@ -61,31 +58,34 @@ public class DynamicFormInstanceDto extends BaseDto { ...@@ -61,31 +58,34 @@ public class DynamicFormInstanceDto extends BaseDto {
@ApiModelProperty(value = "应用标识(数据隔离使用)") @ApiModelProperty(value = "应用标识(数据隔离使用)")
private String appKey; private String appKey;
/** /**
* 不能为空 * 不能为空
*/ */
@TableField("not_null") @TableField("not_null")
private Boolean notNull; private Boolean notNull;
@ApiModelProperty(value = "是否一行显示(兼容已有动态表单使用)") @ApiModelProperty(value = "是否一行显示(兼容已有动态表单使用)")
private Boolean block; private Boolean block;
@ApiModelProperty(value = "配置json") @ApiModelProperty(value = "配置json")
private JSONObject columnConfig; private JSONObject columnConfig;
//新加排序字段
@ApiModelProperty(value = "排序字段") @ApiModelProperty(value = "排序字段")
private int sort; private int sort;
public DynamicFormInstanceDto() {}; @ApiModelProperty(value = "组织机构")
private String orgCode;
public DynamicFormInstanceDto() {
}
public DynamicFormInstanceDto(Long sequenceNbr, String fieldName, String fieldCode, Boolean block, public DynamicFormInstanceDto(Long sequenceNbr, String fieldName, String fieldCode, Boolean block,
String groupCode) { String groupCode) {
this.formColumnId = sequenceNbr; this.formColumnId = sequenceNbr;
this.fieldName = fieldName; this.fieldName = fieldName;
this.fieldCode = fieldCode; this.fieldCode = fieldCode;
this.block = block; this.block = block;
this.groupCode = groupCode; this.groupCode = groupCode;
} }
} }
...@@ -8,80 +8,87 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -8,80 +8,87 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* 动态表单树形分组字段表 * 动态表单树形分组字段表
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value="cb_dynamic_form_column", autoResultMap = true) @TableName(value = "cb_dynamic_form_column", autoResultMap = true)
public class DynamicFormColumn extends BaseEntity { public class DynamicFormColumn extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 字段名 * 字段名
*/ */
@TableField("field_code") @TableField("field_code")
private String fieldCode; private String fieldCode;
/** /**
* 中文名 * 中文名
*/ */
@TableField("field_name") @TableField("field_name")
private String fieldName; private String fieldName;
/** /**
* 字段类型(web使用) * 字段类型(web使用)
*/ */
@TableField("field_type") @TableField("field_type")
private String fieldType; private String fieldType;
/** /**
* 字段分组主键 * 字段分组主键
*/ */
@TableField("group_id") @TableField("group_id")
private Long groupId; private Long groupId;
/** /**
* 查询策略;全等,模糊,区间 * 查询策略;全等,模糊,区间
*/ */
@TableField("query_strategy") @TableField("query_strategy")
private String queryStrategy; private String queryStrategy;
/** /**
* 不能为空 * 不能为空
*/ */
@TableField("not_null") @TableField("not_null")
private Boolean notNull; private Boolean notNull;
/** /**
* 是否一行显示(兼容已有动态表单使用) * 是否一行显示(兼容已有动态表单使用)
*/ */
@TableField("block") @TableField("block")
private Boolean block; private Boolean block;
/** /**
* 所属分组编号 * 所属分组编号
*/ */
@TableField("group_code") @TableField("group_code")
private String groupCode; private String groupCode;
/** /**
* 配置json * 配置json
*/ */
@TableField(value = "column_config", typeHandler = JacksonTypeHandler.class) @TableField(value = "column_config", typeHandler = JacksonTypeHandler.class)
private JSONObject columnConfig; private JSONObject columnConfig;
/** /**
* 操作人名称 * 操作人名称
*/ */
@TableField("rec_user_name") @TableField("rec_user_name")
private String recUserName; private String recUserName;
/** /**
* 提示信息 * 提示信息
*/ */
@TableField("remark") @TableField("remark")
private String remark; private String remark;
/** /**
* 排序字段 * 排序字段
*/ */
@TableField("sort") @TableField("sort")
private int sort; private int sort;
/**
* 组织机构
*/
@TableField("org_code")
private String orgCode;
} }
...@@ -6,12 +6,13 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -6,12 +6,13 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* 动态表单分组表(支持树形) * 动态表单分组表(支持树形)
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
...@@ -22,38 +23,38 @@ public class DynamicFormGroup extends BaseEntity { ...@@ -22,38 +23,38 @@ public class DynamicFormGroup extends BaseEntity {
/** /**
* 分组名称 * 分组名称
*/ */
@TableField("group_name") @TableField("group_name")
private String groupName; private String groupName;
/** /**
* 分组编号 * 分组编号
*/ */
@TableField("group_code") @TableField("group_code")
private String groupCode; private String groupCode;
/** /**
* 父级id(树形关系时使用) * 父级id(树形关系时使用)
*/ */
@TableField("parent_id") @TableField("parent_id")
private Long parentId; private Long parentId;
/** /**
* 分组配置 * 分组配置
*/ */
@TableField("group_config") @TableField("group_config")
private String groupConfig; private String groupConfig;
/** /**
* 组织机构 * 组织机构
*/ */
@TableField("org_code") @TableField("org_code")
private String orgCode; private String orgCode;
/** /**
* 排序 * 排序
*/ */
@TableField("sort") @TableField("sort")
private Integer sort; private Integer sort;
/** /**
* 操作人名称 * 操作人名称
*/ */
@TableField("rec_user_name") @TableField("rec_user_name")
private String recUserName; private String recUserName;
} }
...@@ -8,101 +8,110 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -8,101 +8,110 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* 动态表单实例表 * 动态表单实例表
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value="cb_dynamic_form_instance", autoResultMap = true) @TableName(value = "cb_dynamic_form_instance", autoResultMap = true)
public class DynamicFormInstance extends BaseEntity { public class DynamicFormInstance extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 字段名 * 字段名
*/ */
@TableField("field_code") @TableField("field_code")
private String fieldCode; private String fieldCode;
/** /**
* 中文名 * 中文名
*/ */
@TableField("field_name") @TableField("field_name")
private String fieldName; private String fieldName;
/** /**
* 数据类型:文本,数字,枚举,日期 * 数据类型:文本,数字,枚举,日期
*/ */
@TableField("field_type") @TableField("field_type")
private String fieldType; private String fieldType;
/** /**
* 分组编号 * 分组编号
*/ */
@TableField("group_code") @TableField("group_code")
private String groupCode; private String groupCode;
/** /**
* 字段分组id * 字段分组id
*/ */
@TableField("group_id") @TableField("group_id")
private Long groupId; private Long groupId;
/** /**
* 动态配置字段的值 * 动态配置字段的值
*/ */
@TableField("field_value") @TableField("field_value")
private String fieldValue; private String fieldValue;
/** /**
* field_value的描述(冗余字段,在列表时查询时显示) * field_value的描述(冗余字段,在列表时查询时显示)
*/ */
@TableField("field_value_label") @TableField("field_value_label")
private String fieldValueLabel; private String fieldValueLabel;
/** /**
* 设备实例id * 设备实例id
*/ */
@TableField("instance_id") @TableField("instance_id")
private Long instanceId; private Long instanceId;
/** /**
* 字段定义信息的主键 * 字段定义信息的主键
*/ */
@TableField("form_column_id") @TableField("form_column_id")
private Long formColumnId; private Long formColumnId;
/** /**
* 查询策略;全等,模糊,区间 * 查询策略;全等,模糊,区间
*/ */
@TableField("query_strategy") @TableField("query_strategy")
private String queryStrategy; private String queryStrategy;
/** /**
* 操作人名称 * 操作人名称
*/ */
@TableField("rec_user_name") @TableField("rec_user_name")
private String recUserName; private String recUserName;
/** /**
* 应用标识(数据隔离使用) * 应用标识(数据隔离使用)
*/ */
@TableField("app_key") @TableField("app_key")
private String appKey; private String appKey;
/** /**
* 不能为空 * 不能为空
*/ */
@TableField("not_null") @TableField("not_null")
private Boolean notNull; private Boolean notNull;
/** /**
* 是否一行显示(兼容已有动态表单使用) * 是否一行显示(兼容已有动态表单使用)
*/ */
@TableField("block") @TableField("block")
private Boolean block; private Boolean block;
@TableField(value = "column_Config", typeHandler = JacksonTypeHandler.class) @TableField(value = "column_Config", typeHandler = JacksonTypeHandler.class)
private JSONObject columnConfig; private JSONObject columnConfig;
//新加排序字段 /**
@TableField("sort") * 排序字段
*/
@TableField("sort")
private int sort; private int sort;
/**
* 组织机构
*/
@TableField("org_code")
private String orgCode;
public DynamicFormInstance() { public DynamicFormInstance() {
super(); super();
...@@ -124,7 +133,7 @@ public class DynamicFormInstance extends BaseEntity { ...@@ -124,7 +133,7 @@ public class DynamicFormInstance extends BaseEntity {
} }
public DynamicFormInstance(Long alertFormId, String fieldName, String fieldCode, boolean block, String groupCode, public DynamicFormInstance(Long alertFormId, String fieldName, String fieldCode, boolean block, String groupCode,
String fieldValue, String fieldValueCode) { String fieldValue, String fieldValueCode) {
this.instanceId = alertFormId; this.instanceId = alertFormId;
this.fieldName = fieldName; this.fieldName = fieldName;
this.fieldCode = fieldCode; this.fieldCode = fieldCode;
...@@ -135,7 +144,7 @@ public class DynamicFormInstance extends BaseEntity { ...@@ -135,7 +144,7 @@ public class DynamicFormInstance extends BaseEntity {
} }
public DynamicFormInstance(Long alertFormId, String groupCode, String fieldName, String fieldCode, public DynamicFormInstance(Long alertFormId, String groupCode, String fieldName, String fieldCode,
String fieldValue, String fieldValueCode, Boolean block) { String fieldValue, String fieldValueCode, Boolean block) {
this.instanceId = alertFormId; this.instanceId = alertFormId;
this.groupCode = groupCode; this.groupCode = groupCode;
this.fieldName = fieldName; this.fieldName = fieldName;
......
...@@ -14,7 +14,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -14,7 +14,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.ParseException; import java.text.ParseException;
import java.util.List; import java.util.List;
...@@ -125,6 +124,7 @@ public class DutyCarController extends BaseController { ...@@ -125,6 +124,7 @@ public class DutyCarController extends BaseController {
/** /**
* 值班数据删除 * 值班数据删除
*
* @param instanceId 实例id * @param instanceId 实例id
* @return ResponseModel * @return ResponseModel
*/ */
......
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List; import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import io.swagger.annotations.Api;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/** /**
* 值班班次 * 值班班次
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@RestController @RestController
@Api(tags = "值班班次Api") @Api(tags = "值班班次Api")
@RequestMapping(value = "/common/duty-shift") @RequestMapping(value = "/common/duty-shift")
...@@ -32,77 +32,84 @@ public class DutyShiftController extends BaseController { ...@@ -32,77 +32,84 @@ public class DutyShiftController extends BaseController {
DutyShiftServiceImpl dutyShiftServiceImpl; DutyShiftServiceImpl dutyShiftServiceImpl;
/** /**
* 新增值班班次 * 新增值班班次
* @return *
*/ * @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model) {
model = dutyShiftServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model) public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(@RequestBody DutyShiftDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
{ model.setSequenceNbr(sequenceNbr);
model=dutyShiftServiceImpl.createWithModel(model); return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
return ResponseHelper.buildResponse(model); }
}
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr删除
* @param sequenceNbr 主键 *
* @return * @param sequenceNbr 主键
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(@RequestBody DutyShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据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(dutyShiftServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(dutyShiftServiceImpl.removeById(sequenceNbr));
} }
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* @param sequenceNbr 主键 *
* @return * @param sequenceNbr 主键
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@GetMapping(value = "/{sequenceNbr}") @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次") @GetMapping(value = "/{sequenceNbr}")
public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr) @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次")
{ public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr));
} }
/**
* 列表分页查询 /**
*@param current 当前页 * 列表分页查询
*@param current 每页大小 *
* @return * @param current 当前页
*/ * @param current 每页大小
@TycloudOperation(ApiLevel = UserType.AGENCY) * @return
@GetMapping(value = "/page") */
@ApiOperation(httpMethod = "GET",value = "值班班次分页查询", notes = "值班班次分页查询") @TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel<Page<DutyShiftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size) @GetMapping(value = "/page")
{ @ApiOperation(httpMethod = "GET", value = "值班班次分页查询", notes = "值班班次分页查询")
Page<DutyShiftDto> page=new Page<DutyShiftDto>(); public ResponseModel<Page<DutyShiftDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
page.setCurrent(current); Page<DutyShiftDto> page = new Page<DutyShiftDto>();
page.setSize(size); page.setCurrent(current);
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page)); page.setSize(size);
} return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page));
/** }
*列表全部数据查询
*@return /**
*/ * 列表全部数据查询
@TycloudOperation(ApiLevel = UserType.AGENCY) *
@ApiOperation(httpMethod = "GET",value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询") * @return
@GetMapping(value = "/list") */
public ResponseModel<List<DutyShiftDto>> selectForList() @TycloudOperation(ApiLevel = UserType.AGENCY)
{ @ApiOperation(httpMethod = "GET", value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询")
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList()); @GetMapping(value = "/list")
} public ResponseModel<List<DutyShiftDto>> selectForList() {
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList());
}
} }
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
import com.yeejoin.amos.boot.module.common.api.entity.DutyShift; import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper; import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper;
import com.yeejoin.amos.boot.module.common.api.service.IDutyShiftService; import com.yeejoin.amos.boot.module.common.api.service.IDutyShiftService;
import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List; import java.util.List;
/** /**
* 值班班次服务实现类 * 值班班次服务实现类
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Service @Service
public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,DutyShiftMapper> implements IDutyShiftService { public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, DutyShiftMapper> implements IDutyShiftService {
/** /**
* 分页查询 * 分页查询
*/ */
public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page) { public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page) {
return this.queryForPage(page, null, false); return this.queryForPage(page, null, false);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<DutyShiftDto> queryForDutyShiftList() { public List<DutyShiftDto> queryForDutyShiftList() {
return this.queryForList("" , false); return this.queryForList("", false);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment