diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java new file mode 100644 index 0000000..17d87b4 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java @@ -0,0 +1,150 @@ +package com.rzyc.model.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.Date; + +/** + *
+ * 新增行业清单项 + *
+ */ +@TableName("in_list_item") +@ApiModel(value="InListItem对象", description="行业清单项") +public class InListItemAddDto { + + + @ApiModelProperty(value = "清单项id") + private String itemId; + + @ApiModelProperty(value = "行业清单id") + private String listId; + + @ApiModelProperty(value = "行业id") + private String industryId; + + @ApiModelProperty(value = "清单内容") + private String itemContent; + + @ApiModelProperty(value = "考核指标 1:每年 2:每半年 4:每季度 12:每月") + private Integer standard; + + @ApiModelProperty(value = "频率") + private Integer frequency; + + @ApiModelProperty(value = "附件地址 多个逗号隔开") + private String enclosure; + + @ApiModelProperty(value = "清单依据") + private String itemBasis; + + @ApiModelProperty(value = "清单主要证据") + private String itemProof; + + @ApiModelProperty(value = "清单法律法规") + private String itemLaw; + + + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getListId() { + return listId; + } + + public void setListId(String listId) { + this.listId = listId; + } + + public String getIndustryId() { + return industryId; + } + + public void setIndustryId(String industryId) { + this.industryId = industryId; + } + + public String getItemContent() { + return itemContent; + } + + public void setItemContent(String itemContent) { + this.itemContent = itemContent; + } + + public Integer getStandard() { + return standard; + } + + public void setStandard(Integer standard) { + this.standard = standard; + } + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } + + public String getEnclosure() { + return enclosure; + } + + public void setEnclosure(String enclosure) { + this.enclosure = enclosure; + } + + public String getItemBasis() { + return itemBasis; + } + + public void setItemBasis(String itemBasis) { + this.itemBasis = itemBasis; + } + + public String getItemProof() { + return itemProof; + } + + public void setItemProof(String itemProof) { + this.itemProof = itemProof; + } + + public String getItemLaw() { + return itemLaw; + } + + public void setItemLaw(String itemLaw) { + this.itemLaw = itemLaw; + } + + + @Override + public String toString() { + return "InListItemAddDto{" + + "itemId='" + itemId + '\'' + + ", listId='" + listId + '\'' + + ", industryId='" + industryId + '\'' + + ", itemContent='" + itemContent + '\'' + + ", standard=" + standard + + ", frequency=" + frequency + + ", enclosure='" + enclosure + '\'' + + ", itemBasis='" + itemBasis + '\'' + + ", itemProof='" + itemProof + '\'' + + ", itemLaw='" + itemLaw + '\'' + + '}'; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java index 50faaab..2bcab88 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java @@ -86,6 +86,14 @@ public class InListItem implements Serializable { @TableField("modify_by") private String modifyBy; + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public String getItemId() { return itemId; } @@ -195,21 +203,23 @@ public class InListItem implements Serializable { @Override public String toString() { return "InListItem{" + - "itemId=" + itemId + - ", listId=" + listId + - ", industryId=" + industryId + - ", itemContent=" + itemContent + - ", standard=" + standard + - ", frequency=" + frequency + - ", enclosure=" + enclosure + - ", itemBasis=" + itemBasis + - ", itemProof=" + itemProof + - ", itemLaw=" + itemLaw + - ", sortId=" + sortId + - ", createTime=" + createTime + - ", createBy=" + createBy + - ", modifyTime=" + modifyTime + - ", modifyBy=" + modifyBy + - "}"; + "itemId='" + itemId + '\'' + + ", listId='" + listId + '\'' + + ", industryId='" + industryId + '\'' + + ", itemContent='" + itemContent + '\'' + + ", standard=" + standard + + ", frequency=" + frequency + + ", enclosure='" + enclosure + '\'' + + ", itemBasis='" + itemBasis + '\'' + + ", itemProof='" + itemProof + '\'' + + ", itemLaw='" + itemLaw + '\'' + + ", sortId=" + sortId + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy='" + createBy + '\'' + + ", modifyTime=" + modifyTime + + ", modifyBy='" + modifyBy + '\'' + + '}'; } } + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java index f1d9413..1f49c62 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java @@ -2,10 +2,16 @@ package com.rzyc.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.common.utils.RandomNumber; +import com.common.utils.StringUtils; +import com.common.utils.TypeConversion; import com.common.utils.model.MultiResult; +import com.common.utils.model.Pager; import com.common.utils.model.SingleResult; +import com.github.pagehelper.Page; import com.rzyc.mapper.ent.InListMapper; import com.rzyc.model.dto.InListDto; +import com.rzyc.model.dto.InListItemAddDto; import com.rzyc.model.dto.InListItemDto; import com.rzyc.model.ent.BaseInClass; import com.rzyc.model.ent.InList; @@ -35,13 +41,14 @@ public class IndustryListController extends BaseController{ * @return */ @ApiOperation(value = "父级行业列表", notes = "行业清单列表") - @PostMapping("/selectIndustry") + @GetMapping("/industrySelect") @ResponseBody - public MultiResult