wuzhenyue %!s(int64=3) %!d(string=hai) anos
pai
achega
4f5e74d2c5

+ 3 - 3
application-facade/src/main/java/com/factory/controller/web/OnsiteItemController.java

@@ -60,14 +60,14 @@ public class OnsiteItemController {
 	
 	@ApiOperation(value = "取得巡检项目列表")
 	@PostMapping("/getOnsiteItemList")
-	public ResponseBean getOnsiteItemList(@RequestBody OnsiteItemReq req) {
+	public ResponseBean<PageBean<OnsiteItem>> getOnsiteItemList(@RequestBody OnsiteItemReq req) {
 		QueryWrapper<OnsiteItem> queryWrapper = new QueryWrapper<>();
 		queryWrapper.orderByDesc("id");
         if (req.getTypeFlag() != null) {
-        	queryWrapper.eq("typeFlag", req.getTypeFlag());
+        	queryWrapper.eq("type_flag", req.getTypeFlag());
         }
         if (req.getItemContent() != null) {
-        	queryWrapper.like("itemContent", req.getItemContent());
+        	queryWrapper.like("item_content", req.getItemContent());
         }
         
 		IPage<OnsiteItem> page = new Page<>(req.getPage(), req.getSize());

+ 6 - 0
application-facade/src/main/java/com/factory/web/entity/onsite/OnsiteItem.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,13 +24,18 @@ import lombok.NoArgsConstructor;
 public class OnsiteItem {
 
 	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "巡检项目id")
 	private Long id;
 
+	@ApiModelProperty(value = "关联在工作站id")
 	private Long workshopId;
 
+	@ApiModelProperty(value = "巡检项目内容设置")
 	private String itemContent;
 
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
 	private Integer typeFlag;
 
+	@ApiModelProperty(value = "0非手动 1手动")
 	private Integer inspectionFlag;
 }