Merge remote-tracking branch 'origin/master'

zhc4dev
lenovo 2 years ago
commit e65cc27023
  1. 46
      ant-design-vue-jeecg/src/components/procedure/basicAction.vue
  2. 56
      ant-design-vue-jeecg/src/components/procedure/processAccessories.vue
  3. 83
      ant-design-vue-jeecg/src/components/procedure/processFabric.vue
  4. 20
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
  5. 22
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
  6. 9
      ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
  7. 98
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
  8. 5
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
  9. 37
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
  10. 206
      ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
  11. 123
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue
  12. 84
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue
  13. 60
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
  14. 269
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
  15. 54
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java
  16. 58
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java
  17. 18
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java
  18. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml
  19. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java
  20. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java
  21. 62
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java
  22. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java

@ -1,4 +1,7 @@
<template> <template>
<div>
<div v-for="(item,index) in tableModel" :key="index">
<h3 v-if="index>0">动作{{index+1}}</h3>
<div style="padding: 15px 25px;display: flex;justify-content: space-between" > <div style="padding: 15px 25px;display: flex;justify-content: space-between" >
<img :src="img == ''?img1:img" style="width:30%;"> <img :src="img == ''?img1:img" style="width:30%;">
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/> <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
@ -10,44 +13,48 @@
<!-- </tr>--> <!-- </tr>-->
<tr> <tr>
<td style="text-align: center">频率:</td> <td style="text-align: center">频率:</td>
<td>{{tableModel.freq}}</td> <td>{{item.freq}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">描述:</td> <td style="text-align: center">描述:</td>
<td>{{tableModel.descr}}</td> <td>{{item.descr}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">机器TMU:</td> <td style="text-align: center">机器TMU:</td>
<td>{{tableModel.machineTmu}}</td> <td>{{item.machineTmu}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">手工TMU:</td> <td style="text-align: center">手工TMU:</td>
<td>{{tableModel.machineTmu}}</td> <td>{{item.machineTmu}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">编号:</td> <td style="text-align: center">编号:</td>
<td>{{tableModel.nums}}</td> <td>{{item.nums}}</td>
</tr> </tr>
</table> </table>
</div> </div>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
name: 'basicAction', name: 'basicAction',
// props: { // props: {
// tableModel:{ // model: {
// type: Array, // type: Array,
// default: () =>({}) // default() {
// return []
// } // }
// }, // }},
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',// img:'',//
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'',// mp4:'',//
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
@ -55,7 +62,22 @@
}}, }},
created() { created() {
}, },
methods: {} watch: {
// tableModel
model: function(newVal,oldVal){
if(Array.isArray(newVal)){
this.tableModel = newVal;
}else{
this.tableModel.push(newVal)
}
newVal && this.getTableModel();
}
},
methods: {
getTableModel(){
//
}
},
} }
</script> </script>
<style scoped> <style scoped>

@ -1,36 +1,60 @@
<template> <template>
<div>
<div v-for="(item,index) in tableModel" :key="index">
<h3 v-if="index>0">面料{{index+1}}</h3>
<div style="padding: 15px 25px;display: flex;justify-content: space-between"> <div style="padding: 15px 25px;display: flex;justify-content: space-between">
<img :src="img == ''?img1:img" style="width:30%;"> <!-- <img :src="img == ''?img1:img" style="width:30%;">-->
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/> <!-- <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>-->
<p v-else style="padding-top: 20px"> 暂无视频</p> <!-- <p v-else style="padding-top: 20px"> 暂无视频</p>-->
<table border="1" style="font-size:14px;" class="table" > <!-- <table border="1" style="font-size:14px;" class="table" >-->
<tr> <!-- <tr>-->
<td style="text-align: center">工序:</td> <!-- <td style="text-align: center">工序:</td>-->
<td>{{tableModel.processId}}</td> <!-- <td>{{item.processId}}</td>-->
</tr> <!-- </tr>-->
<tr> <!-- <tr>-->
<td style="text-align: center">面料:</td> <!-- <td style="text-align: center">面料:</td>-->
<td>{{tableModel.accessoriesId}}</td> <!-- <td>{{item.accessoriesId}}</td>-->
</tr> <!-- </tr>-->
</table> <!-- </table>-->
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'processAccessories', name: 'processAccessories',
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',// img:'',//
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'',// mp4:'',//
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
}, },
}}, }},
created() {
},
watch: {
// cData
model: function(newVal,oldVal){
if(Array.isArray(newVal)){
this.tableModel = newVal;
console.log('面料组件')
console.log(this.tableModel)
}else{
this.tableModel.push(newVal)
}
newVal && this.getTableModel();
}
},
methods: {
getTableModel(){
//
}
},
} }
</script> </script>
<style scoped> <style scoped>

@ -1,49 +1,88 @@
<template> <template>
<div style="padding: 15px 25px;display: flex;justify-content: space-between"> <div>
<img :src="img == ''?img1:img" style="width:30%;"> <!-- <div v-for="(item,index) in tableModel" :key="index">-->
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/> <!-- <h3>辅料{{index+1}}</h3>-->
<p v-else style="padding-top: 20px"> 暂无视频</p> <div style="padding: 15px 25px;">
<table border="1" style="font-size:14px;" class="table" > <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">
<tr> <el-descriptions-item>
<td style="text-align: center">工序:</td> <template slot="label"><i class="el-icon-receiving"></i>类型id</template>
<td>{{tableModel.processId}}</td> {{tableModel.typeId}}
</tr> </el-descriptions-item>
<tr> <el-descriptions-item>
<td style="text-align: center">辅料:</td> <template slot="label"><i class="el-icon-coin"></i>编号</template>
<td>{{tableModel.fabricId}}</td> {{tableModel.nums}}
</tr> </el-descriptions-item>
</table> <el-descriptions-item>
<template slot="label"><i class="el-icon-postcard"></i>名称</template>
{{tableModel.contents}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-copy-document"></i>图片</template>
{{tableModel.picture}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-price-tag"></i>材质</template>
{{tableModel.material}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-files"></i>规格</template>
{{tableModel.specs}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-takeaway-box"></i>库存量</template>
{{tableModel.store}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-location-outline"></i>供货商</template>
{{tableModel.supplierInfo}}
</el-descriptions-item>
</el-descriptions>
</div> </div>
</div>
<!-- </div>-->
</template> </template>
<script> <script>
export default { export default {
name: 'processFabric', name: 'processFabric',
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',// img:'',//
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'',// mp4:'',//
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
}, },
}}, }},
created() { created() {
console.log('this.tableModel')
console.log(this.tableModel)
}, },
mounted() { watch: {
console.log('this.tableModel') // cData
model: function(newVal,oldVal){
// if(Array.isArray(newVal)){
// this.tableModel = newVal;
// }else{
// this.tableModel.push(newVal)
this.tableModel= newVal
console.log('组件页面')
console.log(this.tableModel) console.log(this.tableModel)
// }
// newVal && this.getTableModel();
} }
},
methods: {
getTableModel(){
//
}
},
} }
</script> </script>
<style scoped> <style scoped>
.table{border-color:#d9d9d9;border-radius: 3px} .table{border-color:#d9d9d9;border-radius: 3px}
.table td{padding: 10px 20px;max-width: 380px;} .table td{padding: 10px 20px;max-width: 380px;}
.table td span{color: #333} .table td span{color: #333}
/deep/ .ant-modal-body{min-height: 450px;}
.margin-top i{margin-right: 5px}
</style> </style>

@ -7,7 +7,22 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序面料</span></h1> <h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序面料</span></h1>
<processAccessories :tableModel="model"></processAccessories> <!-- <processAccessories :model="model"></processAccessories>-->
<div style="padding: 15px 25px;display: flex;justify-content: space-between">
<img :src="img == ''?img1:img" style="width:30%;">
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
<p v-else style="padding-top: 20px"> 暂无视频</p>
<table border="1" style="font-size:14px;" class="table" >
<tr>
<td style="text-align: center">工序:</td>
<td>{{model.processId}}</td>
</tr>
<tr>
<td style="text-align: center">面料:</td>
<td>{{model.accessoriesId}}</td>
</tr>
</table>
</div>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +40,9 @@ import processAccessories from '@/components/procedure/processAccessories'
return { return {
code:'', code:'',
id:'', id:'',
img:'',//
img1:require('@/assets/9-2.png'),//
mp4:'',//
model:{ model:{
}, },
visible:false, visible:false,

@ -7,7 +7,22 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1> <h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
<processFabric :tableModel="model"></processFabric> <!-- <processFabric :model="model"></processFabric>-->
<div style="padding: 15px 25px;display: flex;justify-content: space-between">
<img :src="img == ''?img1:img" style="width:30%;">
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
<p v-else style="padding-top: 20px"> 暂无视频</p>
<table border="1" style="font-size:14px;" class="table" >
<tr>
<td style="text-align: center">工序:</td>
<td>{{model.processId}}</td>
</tr>
<tr>
<td style="text-align: center">面料:</td>
<td>{{model.fabricId}}</td>
</tr>
</table>
</div>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +40,9 @@ import processFabric from '@/components/procedure/processFabric'
return { return {
code:'', code:'',
id:'', id:'',
img:'',//
img1:require('@/assets/9-2.png'),//
mp4:'',//
model:{ model:{
}, },
visible:false, visible:false,
@ -44,7 +62,7 @@ import processFabric from '@/components/procedure/processFabric'
methods: { methods: {
showModal(id) { showModal(id) {
this.visible = true; this.visible = true;
this.$http.get('pro/zyProcessFabric/queryById?id='+id).then( this.$http.get('/pro/zyProcessFabric/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result this.model = res.result
} }

@ -75,7 +75,7 @@
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record.id)">详情</a>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@ -90,6 +90,7 @@
</div> </div>
<zy-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-accessories-modal> <zy-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-accessories-modal>
<ZyAccessoriesFormDetail ref="ZyAccessoriesFormDetail"></ZyAccessoriesFormDetail>
</a-card> </a-card>
</template> </template>
@ -99,12 +100,13 @@
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyAccessoriesModal from './modules/ZyAccessoriesModal' import ZyAccessoriesModal from './modules/ZyAccessoriesModal'
import ZyAccessoriesFormDetail from './modules/ZyAccessoriesFormDetail'
export default { export default {
name: 'ZyAccessoriesList', name: 'ZyAccessoriesList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ZyAccessoriesModal ZyAccessoriesModal,ZyAccessoriesFormDetail
}, },
data () { data () {
return { return {
@ -204,6 +206,9 @@
fieldList.push({type:'int',value:'store',text:'库存量'}) fieldList.push({type:'int',value:'store',text:'库存量'})
fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'}) fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
this.superFieldList = fieldList this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyAccessoriesFormDetail.showModal(id)
} }
} }
} }

@ -0,0 +1,98 @@
<template>
<div>
<a-modal
title="辅料管理-详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1100'
@ok="handleOk"
@cancel="handleCancel"
>
<h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px;">黄淮学院服装智能制造管理平台 - <span>辅料管理</span></h1>
<!-- <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-receiving"></i>类型id</template>-->
<!-- {{model.typeId}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-coin"></i>编号</template>-->
<!-- {{model.nums}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-postcard"></i>名称</template>-->
<!-- {{model.contents}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-copy-document"></i>图片</template>-->
<!-- {{model.picture}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-price-tag"></i>材质</template>-->
<!-- {{model.material}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-files"></i>规格</template>-->
<!-- {{model.specs}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-takeaway-box"></i>库存量</template>-->
<!-- {{model.store}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-location-outline"></i>供货商</template>-->
<!-- {{model.supplierInfo}}-->
<!-- </el-descriptions-item>-->
<!-- </el-descriptions>-->
<processFabric :model="model"></processFabric>
</a-modal>
</div>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import processFabric from '@/components/procedure/processFabric'
export default {
name: 'ZyAccessoriesFormDetail',
components: {
processFabric
},
data () {
return {
model:{
},
visible: false,
confirmLoading: false,
validatorRules: {
},
}
},
methods:{
showModal(id) {
this.visible = true;
this.$http.get('/accessories/zyAccessories/queryById?id='+id).then(
res=>{
this.model = res.result
console.log('详情页面')
console.log(this.model)
})
},
handleOk() {
this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel() {
this.visible = false;
},
}
}
</script>
<style scoped>
/deep/ .ant-modal-body{min-height: 450px;}
.margin-top i{margin-right: 5px}
</style>

@ -7,7 +7,7 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;">黄淮学院服装智能制造管理平台 - <span>基础动作</span></h1> <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;">黄淮学院服装智能制造管理平台 - <span>基础动作</span></h1>
<basicAction :tableModel="model"></basicAction> <basicAction :model="model"></basicAction>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +25,7 @@ import basicAction from '@/components/procedure/basicAction'
return { return {
model:{ model:{
}, },
id:'',
img:'',// img:'',//
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'',// mp4:'',//
@ -40,6 +41,8 @@ import basicAction from '@/components/procedure/basicAction'
this.$http.get('base/zyClothAction/queryById?id='+id).then( this.$http.get('base/zyClothAction/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result this.model = res.result
console.log('this.model')
console.log(this.model)
} }
) )
}, },

@ -28,24 +28,28 @@
<!-- </div>--> <!-- </div>-->
<!-- </a-card>--> <!-- </a-card>-->
<!-- 基础动作--> <!-- 基础动作-->
<div style="width: 96%;margin:0 auto 30px"> <div class="coin">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2> <h2>基础动作</h2>
<basicAction :tableModel="basicActionData"></basicAction> <basicAction :model="basicActionData"></basicAction>
</div> </div>
<div style="width: 96%;margin:0 auto 30px"> <div class="coin">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">工序面料</h2> <h2>工序面料</h2>
<processFabric :tableModel="accessoriesData"></processFabric> <processAccessories :model="accessoriesData"></processAccessories>
</div>
<div class="coin">
<h2>工序辅料</h2>
<processFabric :model="fabricData"></processFabric>
</div> </div>
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script> <script>
import zyProcess from '@/components/procedure/zyProcess' import zyProcess from '@/components/procedure/zyProcess'
import basicAction from '@/components/procedure/basicAction' import basicAction from '@/components/procedure/basicAction'
import processAccessories from '@/components/procedure/processAccessories'
import processFabric from '@/components/procedure/processFabric' import processFabric from '@/components/procedure/processFabric'
export default { export default {
components:{zyProcess,basicAction,processFabric}, components:{zyProcess,basicAction,processAccessories,processFabric},
data() { data() {
return{ return{
ModalText: 'Content of the modal', ModalText: 'Content of the modal',
@ -56,9 +60,10 @@
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'', mp4:'',
data:{}, data:{},
ProcessData:{}, ProcessData:{},//
basicActionData:[], basicActionData:[],//
accessoriesData:[], accessoriesData:[],//
fabricData:[],//
headStyle:{ headStyle:{
height:'10px' height:'10px'
}, },
@ -73,11 +78,13 @@
res=>{ res=>{
this.data = res.result this.data = res.result
this.ProcessData = res.result.zyProcess this.ProcessData = res.result.zyProcess
this.basicActionData = res.result.zyProcessAction this.basicActionData = res.result.zyClothActions
this.accessoriesData = res.result.zyProcessAccessories this.accessoriesData = res.result.zyFabrics
console.log('this.data') this.fabricData = res.result.zyAccessories
console.log('工序详情页')
console.log(this.data) console.log(this.data)
console.log(this.accessoriesData) console.log(this.accessoriesData)
console.log(this.fabricData)
this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
} }
@ -101,4 +108,6 @@
.table{border-color:#d9d9d9;border-radius: 3px} .table{border-color:#d9d9d9;border-radius: 3px}
.table td{padding: 10px 20px;max-width: 380px;white-space:nowrap} .table td{padding: 10px 20px;max-width: 380px;white-space:nowrap}
.table td span{color: #333} .table td span{color: #333}
.coin{width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;}
.coin h2{text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px}
</style> </style>

@ -0,0 +1,206 @@
<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_type,type_name,id" v-model="queryParam.typeId" ></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_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_cloths_modular ,modular_name,id" v-model="queryParam.modularId" ></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>-->
<!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<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-module-modal ref="modalForm" @ok="modalFormOk"></zy-style-module-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyStyleModuleModal from './modules/ZyStyleModuleModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ZyStyleModuleList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyStyleModuleModal
},
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: 'typeName'
},
{
title:'款式编号',
align:"center",
dataIndex: 'styleNums'
},
{
title:'款式名称',
align:"center",
dataIndex: 'styleNames'
},
{
title:'模块编号',
align:"center",
dataIndex: 'modularNums'
},
{
title:'模块名称',
align:"center",
dataIndex: 'modularName'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/zystylemodule/zyStyleModule/list",
delete: "/zystylemodule/zyStyleModule/delete",
deleteBatch: "/zystylemodule/zyStyleModule/deleteBatch",
exportXlsUrl: "/zystylemodule/zyStyleModule/exportXls",
importExcelUrl: "zystylemodule/zyStyleModule/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:'typeId',text:'类型id',dictCode:"zy_cloths_type,id,type_name"})
fieldList.push({type:'string',value:'styleId',text:'款式id',dictCode:"zy_cloths_style,id,style_names"})
fieldList.push({type:'string',value:'modularId',text:'模块id',dictCode:"zy_cloths_modular ,id,modular_name"})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,123 @@
<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="typeId">
<j-dict-select-tag type="list" v-model="model.typeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择类型" />
</a-form-model-item>
</a-col>
<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="modularId">
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular ,modular_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: 'ZyStyleModuleForm',
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: {
typeId: [
{ required: true, message: '请输入类型id!'},
],
styleId: [
{ required: true, message: '请输入款式id!'},
],
modularId: [
{ required: true, message: '请输入模块id!'},
],
},
url: {
add: "/zystylemodule/zyStyleModule/add",
edit: "/zystylemodule/zyStyleModule/edit",
queryById: "/zystylemodule/zyStyleModule/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-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-style-module-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 ZyStyleModuleForm from './ZyStyleModuleForm'
export default {
name: 'ZyStyleModuleModal',
components: {
ZyStyleModuleForm
},
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-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-module-form>
</j-modal>
</template>
<script>
import ZyStyleModuleForm from './ZyStyleModuleForm'
export default {
name: 'ZyStyleModuleModal',
components: {
ZyStyleModuleForm
},
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,269 @@
package org.jeecg.modules.zystylemodule.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.base.service.IZyClothsModularService;
import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
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-08
* @Version: V1.0
*/
@Api(tags="款式模块表")
@RestController
@RequestMapping("/zystylemodule/zyStyleModule")
@Slf4j
public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyStyleModuleService> {
@Autowired
private IZyStyleModuleService zyStyleModuleService;
@Autowired
private IZyClothsModularService zyClothsModularService;
@Autowired
private IZyClothsStyleService zyClothsStyleService;
@Autowired
private IZyClothsTypeService zyClothsTypeService;
/**
* 分页列表查询
*
* @param zyStyleModule2
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "款式模块表-分页列表查询")
@ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ZyStyleModule zyStyleModule2,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
List<NewStyleModule> listNewStyleModules = new ArrayList<>();
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>();
if(zyStyleModule2.getStyleId()!=null || zyStyleModule2.getModularId()!=null || zyStyleModule2.getTypeId()!=null){
if(zyStyleModule2.getStyleId()!=null){
queryWrapper.eq("style_id",zyStyleModule2.getStyleId());
}
if(zyStyleModule2.getModularId()!=null){
queryWrapper.eq("modular_id",zyStyleModule2.getModularId());
}
if(zyStyleModule2.getTypeId()!=null){
queryWrapper.eq("type_id",zyStyleModule2.getTypeId());
}
}
List<ZyStyleModule> list = zyStyleModuleService.list(queryWrapper);
for (ZyStyleModule zyStyleModule : list){
NewStyleModule newSeMo = new NewStyleModule();
//编辑回显
newSeMo.setId(zyStyleModule.getId());
newSeMo.setTypeId(zyStyleModule.getTypeId());
newSeMo.setStyleId(zyStyleModule.getStyleId());
newSeMo.setModularId(zyStyleModule.getModularId());
//款式编号和名称
String styleId = zyStyleModule.getStyleId();
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId);
newSeMo.setStyleNums(styleById.getNums());
newSeMo.setStyleNames(styleById.getStyleNames());
//模块编号和名称
String modularId = zyStyleModule.getModularId();
ZyClothsModular modularById = zyClothsModularService.getById(modularId);
newSeMo.setModularNums(modularById.getNums());
newSeMo.setModularName(modularById.getModularName());
//服装类型
String typeId = zyStyleModule.getTypeId();
ZyClothsType typeById = zyClothsTypeService.getById(typeId);
newSeMo.setTypeName(typeById.getTypeName());
listNewStyleModules.add(newSeMo);
}
Page page = new Page();
int size = listNewStyleModules.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(listNewStyleModules.get(curIdx + i));
}
page.setCurrent(pageNo).setSize(pageSize).setTotal(listNewStyleModules.size()).setRecords(pageList);
return Result.OK(page);
}
/**
* 分页列表查询
*
* @param zyStyleModule
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "款式模块表-分页列表查询")
@ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询")
@GetMapping(value = "/list1")
public Result<IPage<ZyStyleModule>> queryPageList1(ZyStyleModule zyStyleModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyStyleModule> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap());
Page<ZyStyleModule> page = new Page<ZyStyleModule>(pageNo, pageSize);
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper);
System.out.println(zyStyleModule);
return Result.OK(pageList);
}
/**
* 添加
*
* @param zyStyleModule
* @return
*/
@AutoLog(value = "款式模块表-添加")
@ApiOperation(value="款式模块表-添加", notes="款式模块表-添加")
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ZyStyleModule zyStyleModule) {
zyStyleModuleService.save(zyStyleModule);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param zyStyleModule
* @return
*/
@AutoLog(value = "款式模块表-编辑")
@ApiOperation(value="款式模块表-编辑", notes="款式模块表-编辑")
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ZyStyleModule zyStyleModule) {
zyStyleModuleService.updateById(zyStyleModule);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "款式模块表-通过id删除")
@ApiOperation(value="款式模块表-通过id删除", notes="款式模块表-通过id删除")
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
zyStyleModuleService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "款式模块表-批量删除")
@ApiOperation(value="款式模块表-批量删除", notes="款式模块表-批量删除")
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.zyStyleModuleService.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) {
ZyStyleModule zyStyleModule = zyStyleModuleService.getById(id);
if(zyStyleModule==null) {
return Result.error("未找到对应数据");
}
return Result.OK(zyStyleModule);
}
/**
* 导出excel
*
* @param request
* @param zyStyleModule
*/
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ZyStyleModule zyStyleModule) {
return super.exportXls(request, zyStyleModule, ZyStyleModule.class, "款式模块表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
//@RequiresPermissions("zy_style_module:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyStyleModule.class);
}
}

@ -0,0 +1,54 @@
package org.jeecg.modules.zystylemodule.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
@Data
public class NewStyleModule {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**类型id*/
@Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
@Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
@ApiModelProperty(value = "类型id")
private String typeId;
/**款式id*/
@Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
@Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
@ApiModelProperty(value = "款式id")
private String styleId;
/**模块id*/
@Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
@Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
@ApiModelProperty(value = "模块id")
private String modularId;
/**类型名称*/
@Excel(name = "服装类型名称", width = 15)
@ApiModelProperty(value = "服装类型名称")
private java.lang.String typeName;
/**编号*/
@Excel(name = "款式编号", width = 15)
@ApiModelProperty(value = "款式编号")
private String styleNums;
/**名称*/
@Excel(name = "款式名称", width = 15)
@ApiModelProperty(value = "款式名称")
private String styleNames;
/**编号*/
@Excel(name = "模块编号", width = 15)
@ApiModelProperty(value = "模块编号")
private java.lang.String modularNums;
/**模块名称*/
@Excel(name = "模块名称", width = 15)
@ApiModelProperty(value = "模块名称")
private java.lang.String modularName;
}

@ -0,0 +1,58 @@
package org.jeecg.modules.zystylemodule.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-08
* @Version: V1.0
*/
@Data
@TableName("zy_style_module")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="zy_style_module对象", description="款式模块表")
public class ZyStyleModule implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**类型id*/
@Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
@Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
@ApiModelProperty(value = "类型id")
private String typeId;
/**款式id*/
@Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
@Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
@ApiModelProperty(value = "款式id")
private String styleId;
/**模块id*/
@Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
@Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
@ApiModelProperty(value = "模块id")
private String modularId;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
}

@ -0,0 +1,18 @@
package org.jeecg.modules.zystylemodule.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
/**
* @Description: 款式模块表
* @Author: jeecg-boot
* @Date: 2022-09-08
* @Version: V1.0
*/
public interface ZyStyleModuleMapper extends BaseMapper<ZyStyleModule> {
}

@ -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.demo.zystylemodule.mapper.ZyStyleModuleMapper">
</mapper>

@ -0,0 +1,8 @@
package org.jeecg.modules.zystylemodule.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
public interface INewZyStyleModuleService extends IService<NewStyleModule> {
}

@ -0,0 +1,19 @@
package org.jeecg.modules.zystylemodule.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import java.util.List;
/**
* @Description: 款式模块表
* @Author: jeecg-boot
* @Date: 2022-09-08
* @Version: V1.0
*/
public interface IZyStyleModuleService extends IService<ZyStyleModule> {
}

@ -0,0 +1,62 @@
package org.jeecg.modules.zystylemodule.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.Map;
import java.util.function.Function;
@Service
public class NewZyStyleModuleServiceImpl implements INewZyStyleModuleService {
@Override
public boolean saveBatch(Collection<NewStyleModule> entityList, int batchSize) {
return false;
}
@Override
public boolean saveOrUpdateBatch(Collection<NewStyleModule> entityList, int batchSize) {
return false;
}
@Override
public boolean updateBatchById(Collection<NewStyleModule> entityList, int batchSize) {
return false;
}
@Override
public boolean saveOrUpdate(NewStyleModule entity) {
return false;
}
@Override
public NewStyleModule getOne(Wrapper<NewStyleModule> queryWrapper, boolean throwEx) {
return null;
}
@Override
public Map<String, Object> getMap(Wrapper<NewStyleModule> queryWrapper) {
return null;
}
@Override
public <V> V getObj(Wrapper<NewStyleModule> queryWrapper, Function<? super Object, V> mapper) {
return null;
}
@Override
public BaseMapper<NewStyleModule> getBaseMapper() {
return null;
}
@Override
public Class<NewStyleModule> getEntityClass() {
return null;
}
}

@ -0,0 +1,20 @@
package org.jeecg.modules.zystylemodule.service.impl;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 款式模块表
* @Author: jeecg-boot
* @Date: 2022-09-08
* @Version: V1.0
*/
@Service
public class ZyStyleModuleServiceImpl extends ServiceImpl<ZyStyleModuleMapper, ZyStyleModule> implements IZyStyleModuleService {
}
Loading…
Cancel
Save