From fdf877fd4bbd05283c1a1e5f6c3987780c4af776 Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Tue, 3 Jan 2023 21:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/ZyClothsModularCompentList.vue    |  53 +++++++-
 .../views/process/ZyProcessComponentList.vue  |   2 +-
 .../modules/ZyClothsComponentListDetail.vue   |  12 +-
 .../modules/ZyClothsModularCompentModal.vue   |  13 +-
 .../modules/list/ZyClothsComponentList.vue    |   9 +-
 .../zystylemodular/modules/ZyProcessList.vue  | 121 ++++++++++--------
 .../modules/ZyStyleModularListDetails.vue     |  13 +-
 .../modules/ZyStyleModularModal.vue           |   4 +-
 .../modules/ZyClothsModularList.vue           |   4 +-
 .../ZyClothsComponentController.java          |  22 ++++
 .../controller/ZyClothsModularController.java |   5 +-
 .../base/controller/ZyProcessController.java  |  20 +++
 .../demo/base/mapper/ZyProcessMapper.java     |   6 +
 .../demo/base/service/IZyProcessService.java  |   3 +
 .../service/impl/ZyProcessServiceImpl.java    |  18 ++-
 15 files changed, 223 insertions(+), 82 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
index 71f8345c..36d3f58e 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
@@ -102,7 +102,7 @@
       </a-table>
     </div>
 
-    <zy-cloths-modular-compent-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-compent-modal>
+    <zy-cloths-modular-compent-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-compent-modal>
     <ZyClothsModularCompentListDetails ref="ZyClothsModularCompentListDetails"></ZyClothsModularCompentListDetails>
 
   </a-modal>
@@ -116,6 +116,8 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import ZyClothsModularCompentModal from './modules/ZyClothsModularCompentModal'
 import ZyClothsComponentListDetail from "@views/process/modules/ZyClothsComponentListDetail";
 import ZyClothsModularCompentListDetails from "@views/process/modules/list/ZyClothsModularCompentListDetails";
+import {getAction} from "@api/manage";
+import {filterObj} from "@/utils/util";
 
 
 export default {
@@ -197,6 +199,9 @@ export default {
     },
   },
   methods: {
+    valueChange(value) {
+      if (value) this.loadData()
+    },
     viewDetails(id) {
       this.$refs.ZyClothsModularCompentListDetails.showModal(id);
     },
@@ -239,7 +244,51 @@ export default {
       fieldList.push({type: 'string', value: 'modularType', text: '制衣模块类型', dictCode: ''})
       fieldList.push({type: 'string', value: 'componentId', text: '部件id', dictCode: ''})
       this.superFieldList = fieldList
-    }
+    },
+    loadData(arg) {
+      if(!this.url.list){
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records||res.result;
+          if(res.result.total)
+          {
+            this.ipagination.total = res.result.total;
+          }else{
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei   Date:20201118  for：适配不分页的数据列表------------
+        }
+        if(res.code===510){
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      })
+    },
+
+
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if(this.superQueryParams){
+        sqp['superQueryParams']=encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      return filterObj(param);
+    },
   }
 }
 </script>
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
index 0f735a08..23c45311 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
@@ -8,7 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
   >
-    <p style="font-size: 25px;color:#333; padding-left: 40% ">{{biaoTi}} 部件工序管理</p>
+    <p style="font-size: 25px;color:#333; padding-left: 40% ">{{biaoTi}} 模块工序管理</p>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
index 61e21d5d..379df1e1 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
@@ -50,12 +50,12 @@
       key: 'processId',
       align:'center'
     },
-    {
-      title: '是否瓶颈工序',
-      dataIndex: 'bottleneck',
-      key: 'bottleneck',
-      align:'center'
-    },
+    // {
+    //   title: '是否瓶颈工序',
+    //   dataIndex: 'bottleneck',
+    //   key: 'bottleneck',
+    //   align:'center'
+    // },
     {
       title: '创建时间',
       key: 'createTime',
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
index 4ca31dff..3b9ddc97 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
@@ -17,11 +17,14 @@
 <script>
 
   // import ZyClothsModularCompentForm from './ZyClothsModularCompentForm'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import ZyClothsComponentList from "@views/process/modules/list/ZyClothsComponentList";
   import {postAction} from "@api/manage";
 
   export default {
     name: 'ZyClothsModularCompentModal',
+    mixins: [JeecgListMixin, mixinDevice],
     components: {
       ZyClothsComponentList,
       // ZyClothsModularCompentForm
@@ -47,9 +50,9 @@
     methods: {
       add1 (id) {
         //this.model.componentId = this.$route.query.id;
-        //模块名称 根据id显示模块的名称
+        //模块名称 根据id显示模块的名称 新增传参
         this.model.modularId = id;
-        console.log('this.modularId + modal33333'+id)
+        console.log('this.modularId + modal33333  '+id)
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add1(id);
@@ -72,20 +75,22 @@
         // this.$refs.realForm.submitForm();
         postAction(this.url.add, this.model).then((res) => {
           if (res.success) {
-            console.log(111)
             this.$message.success(res.message);
+
             //this.loadData()
           } else {
-            console.log(222)
             this.$message.warning(res.message);
           }
+
           this.$emit('valueChange', 1)
           this.close()
         })
       },
+
       submitCallback(){
         this.$emit('ok');
         this.visible = false;
+
       },
       handleCancel () {
         this.close()
diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsComponentList.vue
index b8b57e6b..3b65e0ff 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsComponentList.vue
@@ -106,6 +106,7 @@ export default {
     return {
       model:{
         fuId: '',
+        clothsId: '',
       },
       description: 'zy_cloths_component管理页面',
       // 表头
@@ -192,7 +193,7 @@ export default {
         }
       ],
       url: {
-        list: "/base/zyClothsComponent/list",
+        list: "/base/zyClothsComponent/listTwo",
         delete: "/base/zyClothsComponent/delete",
         deleteBatch: "/base/zyClothsComponent/deleteBatch",
         exportXlsUrl: "/base/zyClothsComponent/exportXls",
@@ -227,10 +228,12 @@ export default {
       this.$emit('onChangeRowKey', ids)
     },
     add1(id) {
+      this.queryParam.fuId = id;
+      //this.queryParam.clothsId = this.model.id;
+      this.url.list = '/base/zyClothsComponent/listTwo';
+      this.loadData();
       //this.model.fuId = id;
       // this.loadData()
-      // console.log("list 22222")
-      // console.log("弹窗list层接受到的id 应该等于modularName: "+id);
     },
     initDictConfig(){
     },
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
index cb8287fa..32357268 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
@@ -76,7 +76,6 @@
           </a-button>
         </template>
 
-
       </a-table>
     </div>
   </a-card>
@@ -97,6 +96,9 @@ export default {
   data() {
     return {
       description: 'zy_process管理页面',
+      model:{
+        clothStyleId: '',
+      },
       // 表头
       columns: [
         {
@@ -124,6 +126,11 @@ export default {
         //   align:"center",
         //   dataIndex: 'processDescribe'
         // },
+        {
+          title: '服装类型',
+          align: "center",
+          dataIndex: 'styleId_dictText'
+        },
         {
           title: '工序等级',
           align: "center",
@@ -138,7 +145,7 @@ export default {
 
       ],
       url: {
-        list: "/base/zyProcess/list",
+        list: "/base/zyProcess/listScreen",
         delete: "/base/zyProcess/delete",
         deleteBatch: "/base/zyProcess/deleteBatch",
         exportXlsUrl: "/base/zyProcess/exportXls",
@@ -147,7 +154,7 @@ export default {
       },
       //参数
       loadRouteType: false,
-      styleId: "",
+      styleId: '',
       dictOptions: {},
       superFieldList: [],
     }
@@ -165,7 +172,13 @@ export default {
   methods: {
     initDictConfig() {
     },
-    add() {
+    add(id) {
+      //console.log("list层 id   "+ id)
+      this.model.clothStyleId = id;
+      this.queryParam.clothStyleId = id;
+      //根据服装类型筛选list中的数据
+      this.url.list = '/base/zyProcess/listScreen';
+      this.loadData();
     },
     onSelectChange1(selectedRowKeys, selectionRows) {
       this.selectedRowKeys = selectedRowKeys;
@@ -177,56 +190,56 @@ export default {
       this.$emit('onChangeRowKey', ids)
     },
     //加载传递参数
-    loadParameter() {
-      if (this.loadRouteType === false) {
-        this.styleId = this.$route.query.styleId;
-        console.log(this.styleId)
-        this.loadRouteType = true;
-      }
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.loadParameter();
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
-          } else {
-            this.ipagination.total = 0;
-          }
-          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-        } else {
-          this.$message.warning(res.message)
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    getQueryParams() {
-      //获取查询条件
-      let sqp = {}
-      if (this.superQueryParams) {
-        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
-        sqp['superQueryMatchType'] = this.superQueryMatchType
-      }
-      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
-      param.field = this.getQueryField();
-      param.pageNo = this.ipagination.current;
-      param.pageSize = this.ipagination.pageSize;
-      param.styleId = this.styleId;
-      return filterObj(param);
-    },
+    // loadParameter() {
+    //   if (this.loadRouteType === false) {
+    //     this.styleId = this.$route.query.styleId;
+    //     console.log(this.styleId)
+    //     this.loadRouteType = true;
+    //   }
+    // },
+    // loadData(arg) {
+    //   if (!this.url.list) {
+    //     this.$message.error("请设置url.list属性!")
+    //     return
+    //   }
+    //   //加载数据 若传入参数1则加载第一页的内容
+    //   if (arg === 1) {
+    //     this.ipagination.current = 1;
+    //   }
+    //   this.loadParameter();
+    //   var params = this.getQueryParams();//查询条件
+    //   this.loading = true;
+    //   getAction(this.url.list, params).then((res) => {
+    //     if (res.success) {
+    //       //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+    //       this.dataSource = res.result.records || res.result;
+    //       if (res.result.total) {
+    //         this.ipagination.total = res.result.total;
+    //       } else {
+    //         this.ipagination.total = 0;
+    //       }
+    //       //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+    //     } else {
+    //       this.$message.warning(res.message)
+    //     }
+    //   }).finally(() => {
+    //     this.loading = false
+    //   })
+    // },
+    // getQueryParams() {
+    //   //获取查询条件
+    //   let sqp = {}
+    //   if (this.superQueryParams) {
+    //     sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+    //     sqp['superQueryMatchType'] = this.superQueryMatchType
+    //   }
+    //   var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+    //   param.field = this.getQueryField();
+    //   param.pageNo = this.ipagination.current;
+    //   param.pageSize = this.ipagination.pageSize;
+    //   param.styleId = this.styleId;
+    //   return filterObj(param);
+    // },
     getSuperFieldList() {
       let fieldList = [];
       fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''})
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularListDetails.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularListDetails.vue
index 4bb6c673..54537a14 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularListDetails.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularListDetails.vue
@@ -1,19 +1,20 @@
 <template>
   <div>
     <a-modal
-      title="服装款式详情"
+      title="服装款式之工序详情"
       :visible="visible"
       :confirm-loading="confirmLoading"
       :width='1000'
       @ok="handleOk"
       @cancel="handleCancel">
       <a-spin :spinning="confirmLoading">
-        <h3 style="width: 98%;;margin:0px auto">款式详情</h3>
-        <a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
-                 rowKey="nums" :pagination="false">
-        </a-table>
+<!--        <h3 style="width: 98%;;margin:0px auto">款式详情</h3>-->
+<!--        <a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered-->
+<!--                 rowKey="nums" :pagination="false">-->
+<!--        </a-table>-->
 
-        <h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>
+<!--        <h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>-->
+        <h3 style="width: 98%;;margin:20px auto 0"></h3>
         <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5"
                  rowKey="id" bordered :pagination="false" >
 
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
index e15fcf85..b7987dee 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
@@ -39,10 +39,12 @@
     },
     methods: {
       add () {
+        //从url中拿到数据
         this.model.styleId=this.$route.query.id;
+        //console.log('this.model.styleId   '+this.model.styleId)
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add(this.model.styleId);
         })
       },
       edit (record) {
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
index b2ebeb62..f9733af9 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
@@ -155,8 +155,8 @@ export default {
     add(id, typeId) {
       //zy_cloths_style 中的id和 typeId
       //typeId为zy_cloth_type中的id
-      console.log("新增中拿到的id:    "+id)
-      console.log("新增中拿到的typeId "+typeId)
+      //console.log("新增中拿到的id:     "+id)
+      //console.log("新增中拿到的typeId "+typeId)
       this.model.clothsTypeId = typeId;
       this.queryParam.clothsTypeId = typeId;
       //注意上面的接口也要改变 框架会自动执行那些接口
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
index 4b73669a..ce32c66b 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
@@ -12,6 +12,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.ZyClothsModular;
 import org.jeecg.modules.demo.base.entity.vo.ZyClothsComponentDetail;
 import org.jeecg.modules.demo.base.entity.vo.ZyClothsModularDetail;
 import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
@@ -65,6 +66,27 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
         return Result.OK(pageList);
     }
 
+    /**
+     * 模块部件中的部件列表 分页查询
+     */
+    @AutoLog(value = "zy_cloths_component-分页列表查询")
+    @ApiOperation(value = "zy_cloths_component-分页列表查询", notes = "zy_cloths_component-分页列表查询")
+    @GetMapping(value = "/listTwo")
+    public Result<?> queryPageListTwo(ZyClothsComponent zyClothsComponent,
+                                      @RequestParam(name = "fuId", required = true) String fuId,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        //fuId为制衣模块 zy cloths Modular中的id
+        ZyClothsModular clothsModular = zyClothsModularService.getById(fuId);
+        QueryWrapper<ZyClothsComponent> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsComponent, req.getParameterMap());
+        queryWrapper.eq(StringUtils.hasText(clothsModular.getClothsTypeId()), "cloths_type_id", clothsModular.getClothsTypeId());
+        queryWrapper.eq(StringUtils.hasText(clothsModular.getModularType()), "modular_type",clothsModular.getModularType());
+        Page<ZyClothsComponent> page = new Page<>(pageNo, pageSize);
+        IPage<ZyClothsComponent> pageList = zyClothsComponentService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
 //	 @AutoLog(value = "zy_cloths_component-查询所有")
 //	 @ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
 //	 @GetMapping(value = "/findAll")
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
index 43272150..e77a0e5b 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
@@ -65,8 +65,9 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
         return Result.OK(pageList);
     }
 
-    @AutoLog(value = "zy_cloths_modular-分页列表查询")
-    @ApiOperation(value = "zy_cloths_modular-分页列表查询", notes = "zy_cloths_modular-分页列表查询")
+    /**
+     * 服装款式之款式模块中的模块列表查询接口
+     */
     @GetMapping(value = "/listAnother")
     public Result<?> queryList(ZyClothsModular zyClothsModular,
                                    @RequestParam(name = "clothsTypeId", required = true) String clothsTypeId,
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java
index 549fde8a..41cda422 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java
@@ -28,6 +28,7 @@ import org.jeecg.modules.demo.tools.entity.ZyToolTypes;
 import org.jeecg.modules.demo.tools.service.IZyToolTypesService;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -81,6 +82,25 @@ public class ZyProcessController extends JeecgController<ZyProcess, IZyProcessSe
         return Result.OK(pageList);
     }
 
+    /**
+     * 服装款式之款式工序中的工序接口 分页列表查询
+     * 根据服装类型筛选list中的数据
+     */
+    @GetMapping(value = "/listScreen")
+    public Result<?> queryPageListScreen(ZyProcess zyProcess,
+                                      @RequestParam(name = "clothStyleId", required = true) String clothStyleId,
+                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                      HttpServletRequest req) {
+        //根据clothStyleId 查到服装类型的编号 在根据编号进行筛选
+        String nums = zyProcessService.screenList(clothStyleId);
+        QueryWrapper<ZyProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyProcess, req.getParameterMap());
+        queryWrapper.eq(StringUtils.hasText(nums), "style_id", nums);
+        Page<ZyProcess> page = new Page<ZyProcess>(pageNo, pageSize);
+        IPage<ZyProcess> pageList = zyProcessService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java
index 8b7bf361..e204f5ab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java
@@ -28,4 +28,10 @@ public interface ZyProcessMapper extends BaseMapper<ZyProcess> {
 
     @Select("select process_code from zy_process where style_id=#{id} order by process_code DESC limit 0,1")
     String sort(String id);
+
+    @Select("select type_id from zy_cloths_style where id=#{clothStyleId}")
+    String getTypeId(String clothStyleId);
+
+    @Select("select nums from zy_cloths_type where id=#{typeId}")
+    String getNums(String typeId);
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java
index 210c80e3..c2ff14af 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java
@@ -21,4 +21,7 @@ public interface IZyProcessService extends IService<ZyProcess> {
     public List<ZyProcess> selectByComponentId(String component_id);
 
     String sort(String id);
+
+    /**根据服装类型筛选list中的数据*/
+    String screenList(String clothStyleId);
 }
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java
index e22a94b2..99ce0ab2 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -26,7 +27,9 @@ import java.util.List;
 public class ZyProcessServiceImpl extends ServiceImpl<ZyProcessMapper, ZyProcess> implements IZyProcessService {
 
 
-    @Autowired
+//    @Autowired
+//    private ZyProcessMapper zyProcessMapper;
+    @Resource
     private ZyProcessMapper zyProcessMapper;
 
     @Override
@@ -43,6 +46,19 @@ public class ZyProcessServiceImpl extends ServiceImpl<ZyProcessMapper, ZyProcess
         return zyProcessMapper.sort(id);
     }
 
+    /**
+     * 根据服装类型筛选list中的数据
+     *
+     * @param clothStyleId
+     */
+    @Override
+    public String screenList(String clothStyleId) {
+        //先拿到zy cloths style 中的typeId
+        //在拿到zy cloths type 中的nums
+        String typeId = baseMapper.getTypeId(clothStyleId);
+        return baseMapper.getNums(typeId);
+    }
+
     @Override
     public ZyProcess selectZyprocess(String id) {
       List<String> list=baseMapper.selectByIds(id);