20220803-hou

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java

@@ -0,0 +1,198 @@
+package org.jeecg.modules.demo.pro.controller;
+
+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 org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
+import org.jeecg.modules.demo.pro.service.IZyProcessAccessoriesService;
+
+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.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-08-18
+ * @Version: V1.0
+ */
+@Api(tags="面料表")
+@RestController
+@RequestMapping("/pro/zyProcessAccessories")
+@Slf4j
+public class ZyProcessAccessoriesController extends JeecgController<ZyProcessAccessories, IZyProcessAccessoriesService> {
+	@Autowired
+	private IZyProcessAccessoriesService zyProcessAccessoriesService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param zyProcessAccessories
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	/*
+	* 这个真正的是辅料表
+	*
+	* */
+	@AutoLog(value = "面料表-分页列表查询")
+	@ApiOperation(value="面料表-分页列表查询", notes="面料表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(ZyProcessAccessories zyProcessAccessories,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+	//	QueryWrapper<ZyProcessAccessories> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAccessories, req.getParameterMap());
+		String s=null,t=null;
+		if(zyProcessAccessories.getProcessId()!=null){
+			s="%"+zyProcessAccessories.getProcessId()+"%";
+		}
+		if(zyProcessAccessories.getAccessoriesId()!=null){
+			t="%"+zyProcessAccessories.getAccessoriesId()+"%";
+		}
+		Page<ZyProcessAccessories> page = new Page<ZyProcessAccessories>(pageNo, pageSize);
+		IPage<ZyProcessAccessories> pageList = zyProcessAccessoriesService.page(page, s,t);
+		return Result.OK(pageList);
+	}
+	 @AutoLog(value = "面料表-分页列表查询")
+	 @ApiOperation(value="面料表-分页列表查询", notes="面料表-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyProcessAccessories zyProcessAccessories,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 //	QueryWrapper<ZyProcessAccessories> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAccessories, req.getParameterMap());
+		 String s=zyProcessAccessories.getProcessId(),t=null;
+		 if(zyProcessAccessories.getAccessoriesId()!=null){
+			 t="%"+zyProcessAccessories.getAccessoriesId()+"%";
+		 }
+		 Page<ZyProcessAccessories> page = new Page<ZyProcessAccessories>(pageNo, pageSize);
+		 IPage<ZyProcessAccessories> pageList = zyProcessAccessoriesService.page1(page, s,t);
+		 return Result.OK(pageList);
+	 }
+	
+	/**
+	 *   添加
+	 *
+	 * @param zyProcessAccessories
+	 * @return
+	 */
+	@AutoLog(value = "面料表-添加")
+	@ApiOperation(value="面料表-添加", notes="面料表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+		zyProcessAccessoriesService.save(zyProcessAccessories);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param zyProcessAccessories
+	 * @return
+	 */
+	@AutoLog(value = "面料表-编辑")
+	@ApiOperation(value="面料表-编辑", notes="面料表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+		zyProcessAccessoriesService.updateById(zyProcessAccessories);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "面料表-通过id删除")
+	@ApiOperation(value="面料表-通过id删除", notes="面料表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		zyProcessAccessoriesService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "面料表-批量删除")
+	@ApiOperation(value="面料表-批量删除", notes="面料表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.zyProcessAccessoriesService.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) {
+		ZyProcessAccessories zyProcessAccessories = zyProcessAccessoriesService.getById(id);
+		if(zyProcessAccessories==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(zyProcessAccessories);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param zyProcessAccessories
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ZyProcessAccessories zyProcessAccessories) {
+        return super.exportXls(request, zyProcessAccessories, ZyProcessAccessories.class, "面料表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ZyProcessAccessories.class);
+    }
+
+}

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java

@@ -66,12 +66,37 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		//QueryWrapper<ZyProcessAction> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAction, req.getParameterMap());
+		System.out.println(zyProcessAction);
-		QueryWrapper queryWrapper = new QueryWrapper();
+		String s=null,t=null;
-		Page<ZyProcessAction> page = new Page<ZyProcessAction>(pageNo, pageSize);
+		if(zyProcessAction.getProcessId()!=null){
-		IPage<ZyProcessAction> pageList = zyProcessActionService.page(page, queryWrapper);
+			s="%"+zyProcessAction.getProcessId()+"%";
-		return Result.OK(pageList);
+		}
+		if(zyProcessAction.getActionId()!=null){
+			t="%"+zyProcessAction.getActionId()+"%";
+		}
+			Page<ZyProcessAction> page = new Page<ZyProcessAction>(pageNo, pageSize);
+			IPage<ZyProcessAction> pageList = zyProcessActionService.page(page, s,t);
+			return Result.OK(pageList);
+
 	}
+	 @AutoLog(value = "zy_process_action-分页列表查询")
+	 @ApiOperation(value="zy_process_action-分页列表查询", notes="zy_process_action-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyProcessAction zyProcessAction,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+
+			 //QueryWrapper<ZyProcessAction> queryWrapper1 = QueryGenerator.initQueryWrapper(zyProcessAction, req.getParameterMap()).eq("process_id",zyProcessAction.getProcessId());
+		 String s=zyProcessAction.getProcessId(),t=null;
+		 if(zyProcessAction.getActionId()!=null){
+			 t="%"+zyProcessAction.getActionId()+"%";
+		 }
+			 Page<ZyProcessAction> page = new Page<ZyProcessAction>(pageNo, pageSize);
+			 IPage<ZyProcessAction> pageList = zyProcessActionService.page1(page, s,t);
+			 return Result.OK(pageList);
+
+	 }
 	
 	/**
 	 *   添加

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java

@@ -66,11 +66,35 @@ public class ZyProcessFabricController extends JeecgController<ZyProcessFabric,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ZyProcessFabric> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap());
+		//QueryWrapper<ZyProcessFabric> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap());
+		String s=null,t=null;
+		if(zyProcessFabric.getProcessId()!=null){
+			s="%"+zyProcessFabric.getProcessId()+"%";
+		}
+		if(zyProcessFabric.getFabricId()!=null){
+			t="%"+zyProcessFabric.getFabricId()+"%";
+		}
 		Page<ZyProcessFabric> page = new Page<ZyProcessFabric>(pageNo, pageSize);
-		IPage<ZyProcessFabric> pageList = zyProcessFabricService.page(page, queryWrapper);
+		IPage<ZyProcessFabric> pageList = zyProcessFabricService.page(page,s,t);
 		return Result.OK(pageList);
 	}
+	 @AutoLog(value = "zy_process_fabric-分页列表查询")
+	 @ApiOperation(value="zy_process_fabric-分页列表查询", notes="zy_process_fabric-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyProcessFabric zyProcessFabric,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 //QueryWrapper<ZyProcessFabric> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap());
+		 String s=zyProcessFabric.getProcessId(),t=null;
+
+		 if(zyProcessFabric.getFabricId()!=null){
+			 t="%"+zyProcessFabric.getFabricId()+"%";
+		 }
+		 Page<ZyProcessFabric> page = new Page<ZyProcessFabric>(pageNo, pageSize);
+		 IPage<ZyProcessFabric> pageList = zyProcessFabricService.page1(page,s,t);
+		 return Result.OK(pageList);
+	 }
 
 	/**
 	 *   添加

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java

@@ -66,12 +66,35 @@ public class ZyProcessMachineController extends JeecgController<ZyProcessMachine
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ZyProcessMachine> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap());
+		//QueryWrapper<ZyProcessMachine> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap());
+		String s=null,t=null;
+		if(zyProcessMachine.getProcessId()!=null){
+			s="%"+zyProcessMachine.getProcessId()+"%";
+		}
+		if(zyProcessMachine.getMachineId()!=null){
+			t="%"+zyProcessMachine.getMachineId()+"%";
+		}
 		Page<ZyProcessMachine> page = new Page<ZyProcessMachine>(pageNo, pageSize);
-		IPage<ZyProcessMachine> pageList = zyProcessMachineService.page(page, queryWrapper);
+		IPage<ZyProcessMachine> pageList = zyProcessMachineService.page(page, s,t);
 		return Result.OK(pageList);
 	}
+	 @AutoLog(value = "zy_process_machine-分页列表查询")
+	 @ApiOperation(value="zy_process_machine-分页列表查询", notes="zy_process_machine-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyProcessMachine zyProcessMachine,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 //QueryWrapper<ZyProcessMachine> queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap());
+		 String s=zyProcessMachine.getProcessId(),t=null;
 
+		 if(zyProcessMachine.getMachineId()!=null){
+			 t="%"+zyProcessMachine.getMachineId()+"%";
+		 }
+		 Page<ZyProcessMachine> page = new Page<ZyProcessMachine>(pageNo, pageSize);
+		 IPage<ZyProcessMachine> pageList = zyProcessMachineService.page1(page, s,t);
+		 return Result.OK(pageList);
+	 }
 	/**
 	 *   添加
 	 *

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java

@@ -0,0 +1,67 @@
+package org.jeecg.modules.demo.pro.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-08-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_process_accessories")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_process_accessories对象", description="辅料表与面料表反了")
+public class ZyProcessAccessories implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**工序表id*/
+    @Excel(name = "工序", width = 15, dictTable = "zy_process", dicText = "process_name", dicCode = "id")
+    @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id")
+    @ApiModelProperty(value = "工序表id")
+    private String processId;
+	/**面料表id*/
+    @Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id")
+    @ApiModelProperty(value = "面料表id")
+    private String accessoriesId;
+}

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.demo.pro.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 面料表
+ * @Author: jeecg-boot
+ * @Date:   2022-08-18
+ * @Version: V1.0
+ */
+@Mapper
+public interface ZyProcessAccessoriesMapper extends BaseMapper<ZyProcessAccessories> {
+    @Select("<script>select * from zy_process_accessories <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and accessories_id in (select id from zy_accessories where contents like #{m})</if></where></script>")
+    IPage<ZyProcessAccessories> page(Page<ZyProcessAccessories> page, @Param("p") String s, @Param("m") String t);
+    @Select("<script>select * from zy_process_accessories <where>process_id =#{p}<if test=\" m != null\"> and accessories_id in (select id from zy_accessories where contents like #{m})</if></where></script>")
+    IPage<ZyProcessAccessories> page1(Page<ZyProcessAccessories> page, @Param("p") String s, @Param("m") String t);
+}

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java

@@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-11-03
  * @Version: V1.0
  */
+@Mapper
 public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
-
+    @Select("<script>select * from zy_process_action <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
+    IPage<ZyProcessAction> page(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
+    @Select("<script>select * from zy_process_action <where>process_id =#{p}<if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
+    IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java

@@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.pro.entity.ZyProcessFabric;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-11-10
  * @Version: V1.0
  */
+@Mapper
 public interface ZyProcessFabricMapper extends BaseMapper<ZyProcessFabric> {
 
+    @Select("<script>select * from zy_process_fabric <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
+    IPage<ZyProcessFabric> page(Page<ZyProcessFabric> page, @Param("p") String s, @Param("m") String t);
+    @Select("<script>select * from zy_process_fabric <where>process_id =#{p}<if test=\" m != null\"> and fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
+    IPage<ZyProcessFabric> page1(Page<ZyProcessFabric> page, @Param("p") String s, @Param("m") String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java

@@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.pro.entity.ZyProcessMachine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-11-10
  * @Version: V1.0
  */
+@Mapper
 public interface ZyProcessMachineMapper extends BaseMapper<ZyProcessMachine> {
 
+    @Select("<script>select * from zy_process_machine <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
+    IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, @Param("p") String processId, @Param("m") String machineId);
+    @Select("<script>select * from zy_process_machine <where>process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
+    IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, @Param("p") String s, @Param("m") String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/xml/ZyProcessAccessoriesMapper.xml

@@ -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.pro.mapper.ZyProcessAccessoriesMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessAccessoriesService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.pro.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 面料表
+ * @Author: jeecg-boot
+ * @Date:   2022-08-18
+ * @Version: V1.0
+ */
+public interface IZyProcessAccessoriesService extends IService<ZyProcessAccessories> {
+
+    IPage<ZyProcessAccessories> page(Page<ZyProcessAccessories> page, String s, String t);
+
+    IPage<ZyProcessAccessories> page1(Page<ZyProcessAccessories> page, String s, String t);
+}

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.demo.pro.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,4 +16,7 @@ import java.util.List;
 public interface IZyProcessActionService extends IService<ZyProcessAction> {
 
 
+    IPage<ZyProcessAction> page(Page<ZyProcessAction> page, String s, String t);
+
+    IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, String s, String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessFabricService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.demo.pro.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessFabric;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyProcessFabricService extends IService<ZyProcessFabric> {
 
+    IPage<ZyProcessFabric> page(Page<ZyProcessFabric> page, String s, String t);
+
+    IPage<ZyProcessFabric> page1(Page<ZyProcessFabric> page, String s, String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessMachineService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.demo.pro.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessMachine;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyProcessMachineService extends IService<ZyProcessMachine> {
 
+    IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, String processId, String machineId);
+
+    IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, String s, String t);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessAccessoriesServiceImpl.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.demo.pro.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories;
+import org.jeecg.modules.demo.pro.mapper.ZyProcessAccessoriesMapper;
+import org.jeecg.modules.demo.pro.service.IZyProcessAccessoriesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 面料表
+ * @Author: jeecg-boot
+ * @Date:   2022-08-18
+ * @Version: V1.0
+ */
+@Service
+public class ZyProcessAccessoriesServiceImpl extends ServiceImpl<ZyProcessAccessoriesMapper, ZyProcessAccessories> implements IZyProcessAccessoriesService {
+
+    @Autowired
+    ZyProcessAccessoriesMapper zyProcessAccessoriesMapper;
+    @Override
+    public IPage<ZyProcessAccessories> page(Page<ZyProcessAccessories> page, String s, String t) {
+        return zyProcessAccessoriesMapper.page(page,s,t);
+    }
+
+    @Override
+    public IPage<ZyProcessAccessories> page1(Page<ZyProcessAccessories> page, String s, String t) {
+        return zyProcessAccessoriesMapper.page1(page,s,t);
+    }
+}

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.demo.pro.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
 import org.jeecg.modules.demo.pro.mapper.ZyProcessActionMapper;
 import org.jeecg.modules.demo.pro.service.IZyProcessActionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,5 +21,16 @@ import java.util.List;
 @Service
 public class ZyProcessActionServiceImpl extends ServiceImpl<ZyProcessActionMapper, ZyProcessAction> implements IZyProcessActionService {
 
+    @Autowired
+    ZyProcessActionMapper zyProcessActionMapper;
 
+    @Override
+    public IPage<ZyProcessAction> page(Page<ZyProcessAction> page, String s, String t) {
+        return zyProcessActionMapper.page(page,s,t);
+    }
+
+    @Override
+    public IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, String s, String t) {
+        return zyProcessActionMapper.page1(page,s,t);
+    }
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessFabricServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.demo.pro.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessFabric;
 import org.jeecg.modules.demo.pro.mapper.ZyProcessFabricMapper;
 import org.jeecg.modules.demo.pro.service.IZyProcessFabricService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyProcessFabricServiceImpl extends ServiceImpl<ZyProcessFabricMapper, ZyProcessFabric> implements IZyProcessFabricService {
 
+    @Autowired
+    ZyProcessFabricMapper zyProcessFabricMapper;
+    @Override
+    public IPage<ZyProcessFabric> page(Page<ZyProcessFabric> page, String s, String t) {
+        return zyProcessFabricMapper.page(page,s,t);
+    }
+
+    @Override
+    public IPage<ZyProcessFabric> page1(Page<ZyProcessFabric> page, String s, String t) {
+        return zyProcessFabricMapper.page1(page,s,t);
+    }
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessMachineServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.demo.pro.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.pro.entity.ZyProcessMachine;
 import org.jeecg.modules.demo.pro.mapper.ZyProcessMachineMapper;
 import org.jeecg.modules.demo.pro.service.IZyProcessMachineService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +19,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyProcessMachineServiceImpl extends ServiceImpl<ZyProcessMachineMapper, ZyProcessMachine> implements IZyProcessMachineService {
 
+    @Autowired
+    ZyProcessMachineMapper zyProcessMachine;
+
+    @Override
+    public IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, String processId, String machineId) {
+        return zyProcessMachine.page(page,processId,machineId);
+    }
+
+    @Override
+    public IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, String s, String t) {
+        return zyProcessMachine.page1(page,s,t);
+    }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java

@@ -1,171 +1,177 @@
 package org.jeecg.modules.operationtool.controller;
 
-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 org.jeecg.modules.operationtool.entity.ZyOperationtool;
-import org.jeecg.modules.operationtool.service.IZyOperationtoolService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecg.common.aspect.annotation.AutoLog;
-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.jeecg.modules.operationtool.entity.ZyOperationtool;
+import org.jeecg.modules.operationtool.service.IZyOperationtoolService;
 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;
 
- /**
+import javax.servlet.http.HttpServletRequest;
- * @Description: 工序工具
+import javax.servlet.http.HttpServletResponse;
- * @Author: jeecg-boot
+import java.util.Arrays;
- * @Date:   2021-12-08
+
- * @Version: V1.0
+/**
- */
+* @Description: 工序工具
+* @Author: jeecg-boot
+* @Date:   2021-12-08
+* @Version: V1.0
+*/
 @Api(tags="工序工具")
 @RestController
 @RequestMapping("/operationtool/zyOperationtool")
 @Slf4j
 public class ZyOperationtoolController extends JeecgController<ZyOperationtool, IZyOperationtoolService> {
-	@Autowired
+   @Autowired
-	private IZyOperationtoolService zyOperationtoolService;
+   private IZyOperationtoolService zyOperationtoolService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param zyOperationtool
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "工序工具-分页列表查询")
-	@ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(ZyOperationtool zyOperationtool,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
-		Page<ZyOperationtool> page = new Page<ZyOperationtool>(pageNo, pageSize);
-		IPage<ZyOperationtool> pageList = zyOperationtoolService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param zyOperationtool
-	 * @return
-	 */
-	@AutoLog(value = "工序工具-添加")
-	@ApiOperation(value="工序工具-添加", notes="工序工具-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody ZyOperationtool zyOperationtool) {
-		zyOperationtoolService.save(zyOperationtool);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param zyOperationtool
-	 * @return
-	 */
-	@AutoLog(value = "工序工具-编辑")
-	@ApiOperation(value="工序工具-编辑", notes="工序工具-编辑")
-	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody ZyOperationtool zyOperationtool) {
-		zyOperationtoolService.updateById(zyOperationtool);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "工序工具-通过id删除")
-	@ApiOperation(value="工序工具-通过id删除", notes="工序工具-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		zyOperationtoolService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "工序工具-批量删除")
-	@ApiOperation(value="工序工具-批量删除", notes="工序工具-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.zyOperationtoolService.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) {
-		ZyOperationtool zyOperationtool = zyOperationtoolService.getById(id);
-		if(zyOperationtool==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(zyOperationtool);
-	}
 
-    /**
+   /**
-    * 导出excel
+    * 分页列表查询
     *
-    * @param request
     * @param zyOperationtool
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
     */
-    @RequestMapping(value = "/exportXls")
+   @AutoLog(value = "工序工具-分页列表查询")
-    public ModelAndView exportXls(HttpServletRequest request, ZyOperationtool zyOperationtool) {
+   @ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询")
-        return super.exportXls(request, zyOperationtool, ZyOperationtool.class, "工序工具");
+   @GetMapping(value = "/list")
+   public Result<?> queryPageList(ZyOperationtool zyOperationtool,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  HttpServletRequest req) {
+       //QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
+       System.out.println("asdadad*********************************************");
+       String s=null,t=null;
+       if(zyOperationtool.getOperationid()!=null){
+           s="%"+zyOperationtool.getOperationid()+"%";
+       }
+       if(zyOperationtool.getToolid()!=null){
+           t="%"+zyOperationtool.getToolid()+"%";
+       }
+       Page<ZyOperationtool> page = new Page<ZyOperationtool>(pageNo, pageSize);
+       IPage<ZyOperationtool> pageList = zyOperationtoolService.page(page, s,t);
+       return Result.OK(pageList);
+   }
+    @AutoLog(value = "工序工具-分页列表查询")
+    @ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询")
+    @GetMapping(value = "/list1")
+    public Result<?> queryPageList1(ZyOperationtool zyOperationtool,
+                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                   HttpServletRequest req) {
+        //QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
+        String s=zyOperationtool.getOperationid(),t=null;
+
+        if(zyOperationtool.getToolid()!=null){
+            t="%"+zyOperationtool.getToolid()+"%";
+        }
+        Page<ZyOperationtool> page = new Page<ZyOperationtool>(pageNo, pageSize);
+        IPage<ZyOperationtool> pageList = zyOperationtoolService.page1(page, s,t);
+        return Result.OK(pageList);
     }
+   /**
+    *   添加
+    *
+    * @param zyOperationtool
+    * @return
+    */
+   @AutoLog(value = "工序工具-添加")
+   @ApiOperation(value="工序工具-添加", notes="工序工具-添加")
+   @PostMapping(value = "/add")
+   public Result<?> add(@RequestBody ZyOperationtool zyOperationtool) {
+       zyOperationtoolService.save(zyOperationtool);
+       return Result.OK("添加成功！");
+   }
 
-    /**
+   /**
-      * 通过excel导入数据
+    *  编辑
     *
-    * @param request
+    * @param zyOperationtool
-    * @param response
     * @return
     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   @AutoLog(value = "工序工具-编辑")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+   @ApiOperation(value="工序工具-编辑", notes="工序工具-编辑")
-        return super.importExcel(request, response, ZyOperationtool.class);
+   @PutMapping(value = "/edit")
-    }
+   public Result<?> edit(@RequestBody ZyOperationtool zyOperationtool) {
+       zyOperationtoolService.updateById(zyOperationtool);
+       return Result.OK("编辑成功!");
+   }
+
+   /**
+    *   通过id删除
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "工序工具-通过id删除")
+   @ApiOperation(value="工序工具-通过id删除", notes="工序工具-通过id删除")
+   @DeleteMapping(value = "/delete")
+   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+       zyOperationtoolService.removeById(id);
+       return Result.OK("删除成功!");
+   }
+
+   /**
+    *  批量删除
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "工序工具-批量删除")
+   @ApiOperation(value="工序工具-批量删除", notes="工序工具-批量删除")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.zyOperationtoolService.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) {
+       ZyOperationtool zyOperationtool = zyOperationtoolService.getById(id);
+       if(zyOperationtool==null) {
+           return Result.error("未找到对应数据");
+       }
+       return Result.OK(zyOperationtool);
+   }
+
+   /**
+   * 导出excel
+   *
+   * @param request
+   * @param zyOperationtool
+   */
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, ZyOperationtool zyOperationtool) {
+       return super.exportXls(request, zyOperationtool, ZyOperationtool.class, "工序工具");
+   }
+
+   /**
+     * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, ZyOperationtool.class);
+   }
 
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java

@@ -60,12 +60,18 @@ public class ZyOperationtool implements Serializable {
     @ApiModelProperty(value = "工序")
     private String operationid;
 	/**机器*/
-	@Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+//	@Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+//	@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "机器")
+//    @ApiModelProperty(value = "机器")
-    private String device;
+//    private String device;
 	/**工具*/
-	@Excel(name = "工具", width = 15)
+//	@Excel(name = "工具", width = 15)
+//    @ApiModelProperty(value = "工具")
+//    private String tools;
+
+    @Excel(name = "工具", width = 15, dictTable = "zy_tool_types", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "zy_tool_types", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "工具")
-    private String tools;
+    private String toolid;
+
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java

@@ -2,7 +2,11 @@ package org.jeecg.modules.operationtool.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.operationtool.entity.ZyOperationtool;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-12-08
  * @Version: V1.0
  */
+@Mapper
 public interface ZyOperationtoolMapper extends BaseMapper<ZyOperationtool> {
-
+    @Select("<script>select * from zy_operationtool <where><if test=\" p != null\">operationid in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
+    IPage<ZyOperationtool> page(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
+    @Select("<script>select * from zy_operationtool <where>operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
+    IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/IZyOperationtoolService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.operationtool.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.operationtool.entity.ZyOperationtool;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyOperationtoolService extends IService<ZyOperationtool> {
 
+    IPage<ZyOperationtool> page(Page<ZyOperationtool> page, String s, String t);
+
+    IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, String s, String t);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/impl/ZyOperationtoolServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.operationtool.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.operationtool.entity.ZyOperationtool;
 import org.jeecg.modules.operationtool.mapper.ZyOperationtoolMapper;
 import org.jeecg.modules.operationtool.service.IZyOperationtoolService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyOperationtoolServiceImpl extends ServiceImpl<ZyOperationtoolMapper, ZyOperationtool> implements IZyOperationtoolService {
 
+    @Autowired
+    ZyOperationtoolMapper zyOperationtoolMapper;
+    @Override
+    public IPage<ZyOperationtool> page(Page<ZyOperationtool> page, String s, String t) {
+        return zyOperationtoolMapper.page(page,s,t);
+    }
+
+    @Override
+    public IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, String s, String t) {
+        return zyOperationtoolMapper.page1(page,s,t);
+    }
 }