commit
35440a10e0
24 changed files with 1300 additions and 338 deletions
@ -0,0 +1,195 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="服装款式"> |
||||
<j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_style,style_names,id" v-model="queryParam.styleId" ></j-dict-select-tag> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="面料类型"> |
||||
<j-dict-select-tag placeholder="请选择面料类型" dictCode="zy_fabric,name,id" v-model="queryParam.fabricId" ></j-dict-select-tag> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<div class="table-operator"> |
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> |
||||
<a-button type="primary" icon="download" @click="handleExportXls('款式面料表')">导出</a-button> |
||||
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> |
||||
<a-button type="primary" icon="import">导入</a-button> |
||||
</a-upload>--> |
||||
<!-- 高级查询区域 --> |
||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||
<a-menu slot="overlay"> |
||||
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> |
||||
</a-menu> |
||||
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> |
||||
</a-dropdown> |
||||
</div> |
||||
|
||||
<!-- table区域-begin --> |
||||
<div> |
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
||||
</div> |
||||
|
||||
<a-table |
||||
ref="table" |
||||
size="middle" |
||||
:scroll="{x:true}" |
||||
bordered |
||||
rowKey="id" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
class="j-table-force-nowrap" |
||||
@change="handleTableChange"> |
||||
|
||||
<template slot="htmlSlot" slot-scope="text"> |
||||
<div v-html="text"></div> |
||||
</template> |
||||
<template slot="imgSlot" slot-scope="text,record"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||
</template> |
||||
<template slot="fileSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
||||
<a-button |
||||
v-else |
||||
:ghost="true" |
||||
type="primary" |
||||
icon="download" |
||||
size="small" |
||||
@click="downloadFile(text)"> |
||||
下载 |
||||
</a-button> |
||||
</template> |
||||
|
||||
<span slot="action" slot-scope="text, record"> |
||||
<a @click="handleEdit(record)">编辑</a> |
||||
<a-divider type="vertical" /> |
||||
<a @click="handleDetail(record)">详情</a> |
||||
<a-divider type="vertical" /> |
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
</span> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<zy-style-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-style-fabric-modal> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import { mixinDevice } from '@/utils/mixin' |
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||
import ZyStyleFabricModal from './modules/ZyStyleFabricModal' |
||||
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
||||
|
||||
export default { |
||||
name: 'ZyStyleFabricList', |
||||
mixins:[JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyStyleFabricModal |
||||
}, |
||||
data () { |
||||
return { |
||||
description: '款式面料表管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
{ |
||||
title: '#', |
||||
dataIndex: '', |
||||
key:'rowIndex', |
||||
width:60, |
||||
align:"center", |
||||
customRender:function (t,r,index) { |
||||
return parseInt(index)+1; |
||||
} |
||||
}, |
||||
{ |
||||
title:'款式编号', |
||||
align:"center", |
||||
dataIndex: 'styleNums' |
||||
}, |
||||
{ |
||||
title:'款式名称', |
||||
align:"center", |
||||
dataIndex: 'styleNames' |
||||
}, |
||||
{ |
||||
title:'面料编号', |
||||
align:"center", |
||||
dataIndex: 'fabricNumber' |
||||
}, |
||||
{ |
||||
title:'面料名称', |
||||
align:"center", |
||||
dataIndex: 'fabricName' |
||||
}, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align:"center", |
||||
fixed:"right", |
||||
width:147, |
||||
scopedSlots: { customRender: 'action' } |
||||
} |
||||
], |
||||
url: { |
||||
list: "/zystylefabric/zyStyleFabric/list", |
||||
delete: "/zystylefabric/zyStyleFabric/delete", |
||||
deleteBatch: "/zystylefabric/zyStyleFabric/deleteBatch", |
||||
exportXlsUrl: "/zystylefabric/zyStyleFabric/exportXls", |
||||
importExcelUrl: "zystylefabric/zyStyleFabric/importExcel", |
||||
|
||||
}, |
||||
dictOptions:{}, |
||||
superFieldList:[], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
initDictConfig(){ |
||||
}, |
||||
getSuperFieldList(){ |
||||
let fieldList=[]; |
||||
fieldList.push({type:'string',value:'styleId',text:'款式id',dictCode:"zy_cloths_style,id,style_names"}) |
||||
fieldList.push({type:'string',value:'fabricId',text:'面料id',dictCode:"zy_fabric,id,name"}) |
||||
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,116 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="款式类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"> |
||||
<j-dict-select-tag type="list" v-model="model.styleId" dictCode="zy_cloths_style,style_names,id" placeholder="请选择款式类型" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricId"> |
||||
<j-dict-select-tag type="list" v-model="model.fabricId" dictCode="zy_fabric,name,id" placeholder="请选择面料类型" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
|
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import { httpAction, getAction } from '@/api/manage' |
||||
import { validateDuplicateValue } from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyStyleFabricForm', |
||||
components: { |
||||
}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data () { |
||||
return { |
||||
model:{ |
||||
}, |
||||
labelCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 5 }, |
||||
}, |
||||
wrapperCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 16 }, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: { |
||||
styleId: [ |
||||
{ required: true, message: '请选择服装类型!'}, |
||||
], |
||||
fabricId: [ |
||||
{ required: true, message: '请选择面料类型!'}, |
||||
], |
||||
}, |
||||
url: { |
||||
add: "/zystylefabric/zyStyleFabric/add", |
||||
edit: "/zystylefabric/zyStyleFabric/edit", |
||||
queryById: "/zystylefabric/zyStyleFabric/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled(){ |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created () { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit (record) { |
||||
this.model = Object.assign({}, record); |
||||
this.visible = true; |
||||
}, |
||||
submitForm () { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if(!this.model.id){ |
||||
httpurl+=this.url.add; |
||||
method = 'post'; |
||||
}else{ |
||||
httpurl+=this.url.edit; |
||||
method = 'put'; |
||||
} |
||||
httpAction(httpurl,this.model,method).then((res)=>{ |
||||
if(res.success){ |
||||
that.$message.success(res.message); |
||||
that.$emit('ok'); |
||||
}else{ |
||||
that.$message.warning(res.message); |
||||
} |
||||
}).finally(() => { |
||||
that.confirmLoading = false; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,84 @@ |
||||
<template> |
||||
<a-drawer |
||||
:title="title" |
||||
:width="width" |
||||
placement="right" |
||||
:closable="false" |
||||
@close="close" |
||||
destroyOnClose |
||||
:visible="visible"> |
||||
<zy-style-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-style-fabric-form> |
||||
<div class="drawer-footer"> |
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> |
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> |
||||
</div> |
||||
</a-drawer> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyStyleFabricForm from './ZyStyleFabricForm' |
||||
|
||||
export default { |
||||
name: 'ZyStyleFabricModal', |
||||
components: { |
||||
ZyStyleFabricForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:"操作", |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}); |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
/** Button按钮间距 */ |
||||
.ant-btn { |
||||
margin-left: 30px; |
||||
margin-bottom: 30px; |
||||
float: right; |
||||
} |
||||
.drawer-footer{ |
||||
position: absolute; |
||||
bottom: -8px; |
||||
width: 100%; |
||||
border-top: 1px solid #e8e8e8; |
||||
padding: 10px 16px; |
||||
text-align: right; |
||||
left: 0; |
||||
background: #fff; |
||||
border-radius: 0 0 2px 2px; |
||||
} |
||||
</style> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-style-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-fabric-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyStyleFabricForm from './ZyStyleFabricForm' |
||||
export default { |
||||
name: 'ZyStyleFabricModal', |
||||
components: { |
||||
ZyStyleFabricForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,241 @@ |
||||
package org.jeecg.modules.zystylefabric.controller; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.stream.Collectors; |
||||
import java.io.IOException; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.net.URLDecoder; |
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import org.jeecg.common.api.vo.Result; |
||||
import org.jeecg.common.system.query.QueryGenerator; |
||||
import org.jeecg.common.util.oConvertUtils; |
||||
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
|
||||
import org.jeecg.modules.demo.base.entity.ZyClothsModular; |
||||
import org.jeecg.modules.demo.base.entity.ZyClothsType; |
||||
import org.jeecg.modules.demo.fabric.entity.ZyFabric; |
||||
import org.jeecg.modules.demo.fabric.service.IZyFabricService; |
||||
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; |
||||
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
||||
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
||||
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
||||
import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; |
||||
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; |
||||
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; |
||||
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; |
||||
import org.jeecgframework.poi.excel.ExcelImportUtil; |
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
||||
import org.jeecgframework.poi.excel.entity.ExportParams; |
||||
import org.jeecgframework.poi.excel.entity.ImportParams; |
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
||||
import org.jeecg.common.system.base.controller.JeecgController; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.web.multipart.MultipartFile; |
||||
import org.springframework.web.multipart.MultipartHttpServletRequest; |
||||
import org.springframework.web.servlet.ModelAndView; |
||||
import com.alibaba.fastjson.JSON; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import org.jeecg.common.aspect.annotation.AutoLog; |
||||
|
||||
/** |
||||
* @Description: 款式面料表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-09-15 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Api(tags="款式面料表") |
||||
@RestController |
||||
@RequestMapping("/zystylefabric/zyStyleFabric") |
||||
@Slf4j |
||||
public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyStyleFabricService> { |
||||
@Autowired |
||||
private IZyStyleFabricService zyStyleFabricService; |
||||
@Autowired |
||||
private INewZyStyleFabricService NewZyStyleFabricService; |
||||
@Autowired |
||||
private IZyClothsStyleService zyClothsStyleService; |
||||
@Autowired |
||||
private IZyFabricService zyFabricService; |
||||
|
||||
/** |
||||
* 分页列表查询 |
||||
* |
||||
* @param zyStyleFabric |
||||
* @param pageNo |
||||
* @param pageSize |
||||
* @param req |
||||
* @return |
||||
*/ |
||||
//@AutoLog(value = "款式面料表-分页列表查询")
|
||||
@ApiOperation(value="款式面料表-分页列表查询", notes="款式面料表-分页列表查询") |
||||
@GetMapping(value = "/list") |
||||
public Result<IPage<NewZyStyleFabric>> queryPageList(ZyStyleFabric zyStyleFabric, |
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
||||
HttpServletRequest req) { |
||||
QueryWrapper<ZyStyleFabric> queryWrapper = new QueryWrapper<>(); |
||||
if(zyStyleFabric.getStyleId()!=null || zyStyleFabric.getFabricId()!=null ){ |
||||
if(zyStyleFabric.getStyleId()!=null){ |
||||
queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); |
||||
} |
||||
if(zyStyleFabric.getFabricId()!=null){ |
||||
queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); |
||||
} |
||||
|
||||
} |
||||
List<ZyStyleFabric> list = zyStyleFabricService.list(queryWrapper); |
||||
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>(); |
||||
for (ZyStyleFabric zyStyleF : list){ |
||||
NewZyStyleFabric newZySF = new NewZyStyleFabric(); |
||||
//编辑回显
|
||||
newZySF.setId(zyStyleF.getId()); |
||||
newZySF.setFabricId(zyStyleF.getFabricId()); |
||||
newZySF.setStyleId(zyStyleF.getStyleId()); |
||||
//款式编号和名称
|
||||
String styleId = zyStyleF.getStyleId(); |
||||
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); |
||||
newZySF.setStyleNums(styleById.getNums()); |
||||
newZySF.setStyleNames(styleById.getStyleNames()); |
||||
//模块编号和名称
|
||||
String fabricId = zyStyleF.getFabricId(); |
||||
ZyFabric fabricById = zyFabricService.getById(fabricId); |
||||
newZySF.setFabricNumber(fabricById.getFabricNumber()); |
||||
newZySF.setFabricName(fabricById.getName()); |
||||
newZyStyleFabrics.add(newZySF); |
||||
} |
||||
Page page = new Page(); |
||||
int size = newZyStyleFabrics.size(); |
||||
if (pageSize > size && size!=0) { |
||||
pageSize = size; |
||||
} |
||||
// 求出最大页数，防止currentPage越界
|
||||
int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; |
||||
if (pageNo > maxPage) { |
||||
pageNo = maxPage; |
||||
} |
||||
// 当前页第一条数据的下标
|
||||
int curIdx = pageNo > 1 ? (pageNo - 1) * pageSize : 0; |
||||
List pageList = new ArrayList(); |
||||
// 将当前页的数据放进pageList
|
||||
for (int i = 0; i < pageSize && curIdx + i < size; i++) { |
||||
pageList.add(newZyStyleFabrics.get(curIdx + i)); |
||||
} |
||||
page.setCurrent(pageNo).setSize(pageSize).setTotal(newZyStyleFabrics.size()).setRecords(pageList); |
||||
return Result.OK(page); |
||||
} |
||||
|
||||
/** |
||||
* 添加 |
||||
* |
||||
* @param zyStyleFabric |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "款式面料表-添加") |
||||
@ApiOperation(value="款式面料表-添加", notes="款式面料表-添加") |
||||
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add")
|
||||
@PostMapping(value = "/add") |
||||
public Result<String> add(@RequestBody ZyStyleFabric zyStyleFabric) { |
||||
zyStyleFabricService.save(zyStyleFabric); |
||||
return Result.OK("添加成功！"); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* |
||||
* @param zyStyleFabric |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "款式面料表-编辑") |
||||
@ApiOperation(value="款式面料表-编辑", notes="款式面料表-编辑") |
||||
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) |
||||
public Result<String> edit(@RequestBody ZyStyleFabric zyStyleFabric) { |
||||
zyStyleFabricService.updateById(zyStyleFabric); |
||||
return Result.OK("编辑成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id删除 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "款式面料表-通过id删除") |
||||
@ApiOperation(value="款式面料表-通过id删除", notes="款式面料表-通过id删除") |
||||
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete")
|
||||
@DeleteMapping(value = "/delete") |
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) { |
||||
zyStyleFabricService.removeById(id); |
||||
return Result.OK("删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除 |
||||
* |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "款式面料表-批量删除") |
||||
@ApiOperation(value="款式面料表-批量删除", notes="款式面料表-批量删除") |
||||
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch") |
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
||||
this.zyStyleFabricService.removeByIds(Arrays.asList(ids.split(","))); |
||||
return Result.OK("批量删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id查询 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
//@AutoLog(value = "款式面料表-通过id查询")
|
||||
@ApiOperation(value="款式面料表-通过id查询", notes="款式面料表-通过id查询") |
||||
@GetMapping(value = "/queryById") |
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { |
||||
ZyStyleFabric zyStyleFabric = zyStyleFabricService.getById(id); |
||||
if(zyStyleFabric==null) { |
||||
return Result.error("未找到对应数据"); |
||||
} |
||||
return Result.OK(zyStyleFabric); |
||||
} |
||||
|
||||
/** |
||||
* 导出excel |
||||
* |
||||
* @param request |
||||
* @param zyStyleFabric |
||||
*/ |
||||
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:exportXls")
|
||||
@RequestMapping(value = "/exportXls") |
||||
public ModelAndView exportXls(HttpServletRequest request, ZyStyleFabric zyStyleFabric) { |
||||
return super.exportXls(request, zyStyleFabric, ZyStyleFabric.class, "款式面料表"); |
||||
} |
||||
|
||||
/** |
||||
* 通过excel导入数据 |
||||
* |
||||
* @param request |
||||
* @param response |
||||
* @return |
||||
*/ |
||||
//@RequiresPermissions("zy_style_fabric:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
||||
return super.importExcel(request, response, ZyStyleFabric.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,47 @@ |
||||
package org.jeecg.modules.zystylefabric.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
|
||||
@Data |
||||
public class NewZyStyleFabric { |
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/**款式id*/ |
||||
@Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") |
||||
@ApiModelProperty(value = "款式id") |
||||
private java.lang.String styleId; |
||||
/**面料id*/ |
||||
@Excel(name = "面料id", width = 15, dictTable = "zy_fabric",dicText = "name", dicCode = "id") |
||||
@ApiModelProperty(value = "面料id") |
||||
private java.lang.String fabricId; |
||||
/**名称*/ |
||||
@Excel(name = "名称", width = 15) |
||||
@ApiModelProperty(value = "名称") |
||||
private java.lang.String fabricName; |
||||
/**材料编号*/ |
||||
@Excel(name = "材料编号", width = 15) |
||||
@ApiModelProperty(value = "材料编号") |
||||
private java.lang.String fabricNumber; |
||||
/**编号*/ |
||||
@Excel(name = "编号", width = 15) |
||||
@ApiModelProperty(value = "编号") |
||||
private String styleNums; |
||||
/**名称*/ |
||||
@Excel(name = "名称", width = 15) |
||||
@ApiModelProperty(value = "名称") |
||||
private String styleNames; |
||||
/**创建日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private java.util.Date createTime; |
||||
} |
||||
@ -0,0 +1,53 @@ |
||||
package org.jeecg.modules.zystylefabric.entity; |
||||
|
||||
import java.io.Serializable; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.util.Date; |
||||
import java.math.BigDecimal; |
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import lombok.Data; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
|
||||
/** |
||||
* @Description: 款式面料表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-09-15 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_style_fabric") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value="zy_style_fabric对象", description="款式面料表") |
||||
public class ZyStyleFabric implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/**款式id*/ |
||||
@Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") |
||||
@Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") |
||||
@ApiModelProperty(value = "款式id") |
||||
private java.lang.String styleId; |
||||
/**面料id*/ |
||||
@Excel(name = "面料id", width = 15, dictTable = "zy_fabric",dicText = "name", dicCode = "id") |
||||
@Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id") |
||||
@ApiModelProperty(value = "面料id") |
||||
private java.lang.String fabricId; |
||||
/**创建日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private java.util.Date createTime; |
||||
} |
||||
@ -0,0 +1,17 @@ |
||||
package org.jeecg.modules.zystylefabric.mapper; |
||||
|
||||
import java.util.List; |
||||
|
||||
import org.apache.ibatis.annotations.Param; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
||||
|
||||
/** |
||||
* @Description: 款式面料表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-09-15 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface ZyStyleFabricMapper extends BaseMapper<ZyStyleFabric> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,8 @@ |
||||
package org.jeecg.modules.zystylefabric.service; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
||||
|
||||
public interface INewZyStyleFabricService extends IService<NewZyStyleFabric> { |
||||
} |
||||
@ -0,0 +1,15 @@ |
||||
package org.jeecg.modules.zystylefabric.service; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
||||
|
||||
/** |
||||
* @Description: 款式面料表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-09-15 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface IZyStyleFabricService extends IService<ZyStyleFabric> { |
||||
|
||||
} |
||||
@ -0,0 +1,59 @@ |
||||
package org.jeecg.modules.zystylefabric.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
||||
import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; |
||||
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.Collection; |
||||
import java.util.Map; |
||||
import java.util.function.Function; |
||||
@Service |
||||
public class NewZyStyleFabricServiceImpl implements INewZyStyleFabricService { |
||||
@Override |
||||
public boolean saveBatch(Collection<NewZyStyleFabric> entityList, int batchSize) { |
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
public boolean saveOrUpdateBatch(Collection<NewZyStyleFabric> entityList, int batchSize) { |
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
public boolean updateBatchById(Collection<NewZyStyleFabric> entityList, int batchSize) { |
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
public boolean saveOrUpdate(NewZyStyleFabric entity) { |
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
public NewZyStyleFabric getOne(Wrapper<NewZyStyleFabric> queryWrapper, boolean throwEx) { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public Map<String, Object> getMap(Wrapper<NewZyStyleFabric> queryWrapper) { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public <V> V getObj(Wrapper<NewZyStyleFabric> queryWrapper, Function<? super Object, V> mapper) { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public BaseMapper<NewZyStyleFabric> getBaseMapper() { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public Class<NewZyStyleFabric> getEntityClass() { |
||||
return null; |
||||
} |
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
package org.jeecg.modules.zystylefabric.service.impl; |
||||
|
||||
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
||||
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; |
||||
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
|
||||
/** |
||||
* @Description: 款式面料表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-09-15 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyStyleFabricServiceImpl extends ServiceImpl<ZyStyleFabricMapper, ZyStyleFabric> implements IZyStyleFabricService { |
||||
|
||||
} |
||||
@ -1,5 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.demo.zystylemodule.mapper.ZyStyleModuleMapper"> |
||||
<mapper namespace="org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper"> |
||||
|
||||
</mapper> |
||||
Loading…
Reference in new issue