Merge pull request 'jh' (#7) from yanyang into master

Reviewed-on: #7

ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java

@@ -115,7 +115,7 @@ public class FactoryController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<FactoryDTO> list = factoryService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Factory", list, FactoryExcel.class);
     }
 
     @PostMapping("status")

ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java

@@ -2,7 +2,6 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -58,6 +57,7 @@ public class MachineController {
         return new Result<PageData<MachineDTO>>().ok(page);
     }
 
+    /*
     @GetMapping("page2")
     @ApiOperation("分页2")
     @ApiImplicitParams({
@@ -68,11 +68,12 @@ public class MachineController {
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
     //@PreAuthorize("@ex.hasAuthority('code:machine:page')")
-    public Result<PageData<MachineVo>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
+    public Result<PageData<MachineDTO>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
-        PageData<MachineVo> page = machineService.page1(params);
+        PageData<MachineDTO> page = machineService.page1(params);
 
-        return new Result<PageData<MachineVo>>().ok(page);
+        return new Result<PageData<MachineDTO>>().ok(page);
     }
+     */
 
     @GetMapping("{id}")
     @ApiOperation("信息")
@@ -129,7 +130,7 @@ public class MachineController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MachineDTO> list = machineService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Machine", list, MachineExcel.class);
     }
 
     @PostMapping("status")

ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java

@@ -112,7 +112,7 @@ public class PlatformController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PlatformDTO> list = platformService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Platform", list, PlatformExcel.class);
     }
 
     @PostMapping("status")

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java

@@ -1,7 +1,5 @@
 package com.cnbm.basic.controller;
 
-import com.cnbm.admin.annotation.LogOperation;
-import com.cnbm.basic.dto.WorkingProcedureDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -115,7 +113,7 @@ public class ProductWorkingprocedureRelationController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProductWorkingprocedureRelationExcel.class);
     }
 
-    @GetMapping("{productId}")
+    @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
     //@LogOperation("查询所有工序 依据产品id")
     public Result<List<ProductWorkingprocedureRelationDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){

ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java

@@ -112,7 +112,7 @@ public class UnitController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UnitDTO> list = unitService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "Unit", list, UnitExcel.class);
     }
 
     @PostMapping("status")

ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java

@@ -126,7 +126,7 @@ public class WorkingProcedureController {
         return new Result();
     }
 
-    @GetMapping("getWorkingprocedureByProductId")
+    @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
     //@LogOperation("查询所有工序 依据产品id")
     public Result<List<WorkingProcedureDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){

ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java

@@ -112,7 +112,7 @@ public class WorkingProcedureTypeController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingProcedureTypeDTO> list = workingProcedureTypeService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "WorkingProcedureType", list, WorkingProcedureTypeExcel.class);
     }
 
     @PostMapping("status")

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @since  2022-07-15
  */
 @Data
-@ApiModel(value = "工序 表DTO对象")
+@ApiModel(value = "产品-工序 关系表DTO对象")
 public class ProductWorkingprocedureRelationDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -34,7 +34,7 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
 	private String workingProcedureName;
 
 	@ApiModelProperty(value = "顺序，工序是有先后顺序的。")
-	private Integer order;
+	private Integer sequence;
 
 	@ApiModelProperty(value = "1 可用，0 不可用")
 	private Integer status;

ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java

@@ -18,7 +18,7 @@ import lombok.Data;
  */
 @Data
 @TableName("product_workingprocedure_relation")
-@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "工序 表")
+@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "产品-工序 关系表")
 public class ProductWorkingprocedureRelation implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,7 +33,7 @@ public class ProductWorkingprocedureRelation implements Serializable {
     private Long workingProcedureId;
 
     @ApiModelProperty("顺序，工序是有先后顺序的。")
-    private Integer order;
+    private Integer sequence;
 
     @ApiModelProperty("1 可用，0 不可用")
     private Integer status;

ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java

@@ -15,37 +15,37 @@ import java.util.Date;
  */
 @Data
 public class FactoryExcel {
-    @Excel(name = "ID")
+//    @Excel(name = "ID")
-    private Long id;
+//    private Long id;
-    @Excel(name = "工厂 名")
+    @Excel(name = "工厂名称")
     private String name;
-    @Excel(name = "工厂 编码")
+    @Excel(name = "工厂编码")
     private String code;
-    @Excel(name = "工厂 描述")
+    @Excel(name = "描述")
     private String descs;
-    @Excel(name = "工厂 联系地址")
+    @Excel(name = "联系地址")
     private String address;
-    @Excel(name = "工厂类型，1-内部工厂；2-供应商")
+    @Excel(name = "工厂类型")
     private String type;
-    @Excel(name = "1 可用，0 不可用")
+//    @Excel(name = "1 可用，0 不可用")
-    private Integer status;
+//    private Integer status;
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
-    private String remark;
+//    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+//    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
+//    private Integer valid;
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private Long creatorId;
+//    private Long creatorId;
-    @Excel(name = "创建人姓名")
+//    @Excel(name = "创建人姓名")
-    private String creatorName;
+//    private String creatorName;
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private Long updaterId;
+//    private Long updaterId;
-    @Excel(name = "更新人姓名")
+//    @Excel(name = "更新人姓名")
-    private String updaterName;
+//    private String updaterName;
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
-    private Integer version;
+//    private Integer version;
 
 }

ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java

@@ -13,33 +13,35 @@ import java.time.LocalDateTime;
  */
 @Data
 public class MachineExcel {
-    @Excel(name = "ID")
+//    @Excel(name = "ID")
-    private Long id;
+//    private Long id;
     @Excel(name = "机台名")
     private String name;
     @Excel(name = "机台编码")
     private String code;
-    @Excel(name = "机台id，关联platform id")
+//    @Excel(name = "机台id，关联platform id")
-    private Long platformId;
+//    private Long platformId;
-    @Excel(name = "1 可用，0 不可用")
+    @Excel(name = "站点")
-    private Integer status;
+    private String platformName;
+//    @Excel(name = "1 可用，0 不可用")
+//    private Integer status;
     @Excel(name = "备注")
     private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+//    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
+//    private Integer valid;
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private Long creatorId;
+//    private Long creatorId;
-    @Excel(name = "创建人姓名")
+//    @Excel(name = "创建人姓名")
-    private String creatorName;
+//    private String creatorName;
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private Long updaterId;
+//    private Long updaterId;
-    @Excel(name = "更新人姓名")
+//    @Excel(name = "更新人姓名")
-    private String updaterName;
+//    private String updaterName;
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
-    private Integer version;
+//    private Integer version;
 
 }

ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java

@@ -13,33 +13,33 @@ import java.time.LocalDateTime;
  */
 @Data
 public class PlatformExcel {
-    @Excel(name = "ID")
+//    @Excel(name = "ID")
-    private Long id;
+//    private Long id;
     @Excel(name = "站台名")
     private String name;
     @Excel(name = "站台编码")
     private String code;
     @Excel(name = "站台分组")
     private String platformGroup;
-    @Excel(name = "1 可用，0 不可用")
+//    @Excel(name = "1 可用，0 不可用")
-    private Integer status;
+//    private Integer status;
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
-    private String remark;
+//    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+//    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
+//    private Integer valid;
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private Long creatorId;
+//    private Long creatorId;
-    @Excel(name = "创建人姓名")
+//    @Excel(name = "创建人姓名")
-    private String creatorName;
+//    private String creatorName;
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private Long updaterId;
+//    private Long updaterId;
-    @Excel(name = "更新人姓名")
+//    @Excel(name = "更新人姓名")
-    private String updaterName;
+//    private String updaterName;
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
-    private Integer version;
+//    private Integer version;
 
 }

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java

@@ -20,7 +20,7 @@ public class ProductWorkingprocedureRelationExcel {
     @Excel(name = "工序id,关联 working_procedure 表")
     private Long workingProcedureId;
     @Excel(name = "顺序，工序是有先后顺序的。")
-    private Integer order;
+    private Integer sequence;
     @Excel(name = "1 可用，0 不可用")
     private Integer status;
     @Excel(name = "备注")

ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java

@@ -13,33 +13,33 @@ import java.time.LocalDateTime;
  */
 @Data
 public class UnitExcel {
-    @Excel(name = "ID")
+//    @Excel(name = "ID")
-    private Long id;
+//    private Long id;
     @Excel(name = "单位 名")
     private String name;
     @Excel(name = "单位 编码")
     private String code;
-    @Excel(name = "单位类型，1 可计数，2 不可计数")
+//    @Excel(name = "单位类型，1 可计数，2 不可计数")
-    private Integer type;
+//    private Integer type;
-    @Excel(name = "1 可用，0 不可用")
+//    @Excel(name = "1 可用，0 不可用")
-    private Integer status;
+//    private Integer status;
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
-    private String remark;
+//    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+//    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
+//    private Integer valid;
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private Long creatorId;
+//    private Long creatorId;
-    @Excel(name = "创建人姓名")
+//    @Excel(name = "创建人姓名")
-    private String creatorName;
+//    private String creatorName;
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private Long updaterId;
+//    private Long updaterId;
-    @Excel(name = "更新人姓名")
+//    @Excel(name = "更新人姓名")
-    private String updaterName;
+//    private String updaterName;
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
-    private Integer version;
+//    private Integer version;
 
 }

ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java

@@ -13,31 +13,31 @@ import java.time.LocalDateTime;
  */
 @Data
 public class WorkingProcedureTypeExcel {
-    @Excel(name = "ID")
+//    @Excel(name = "ID")
-    private Long id;
+//    private Long id;
     @Excel(name = "工序类型 名")
     private String name;
     @Excel(name = "工序类型 编码")
     private String code;
-    @Excel(name = "1 可用，0 不可用")
+//    @Excel(name = "1 可用，0 不可用")
-    private Integer status;
+//    private Integer status;
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
-    private String remark;
+//    private String remark;
-    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+//    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
-    private Integer valid;
+//    private Integer valid;
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private Long creatorId;
+//    private Long creatorId;
-    @Excel(name = "创建人姓名")
+//    @Excel(name = "创建人姓名")
-    private String creatorName;
+//    private String creatorName;
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private Long updaterId;
+//    private Long updaterId;
-    @Excel(name = "更新人姓名")
+//    @Excel(name = "更新人姓名")
-    private String updaterName;
+//    private String updaterName;
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
-    private Integer version;
+//    private Integer version;
 
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Factory;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 工厂 表
  *
@@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactoryMapper extends BaseDao<Factory> {
-	
+
+    List<FactoryDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java

@@ -3,13 +3,13 @@ package com.cnbm.basic.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.basic.dto.MachineDTO;
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Machine;
 import com.cnbm.common.page.PageData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,5 +20,7 @@ import java.util.Map;
  */
 @Mapper
 public interface MachineMapper extends BaseDao<Machine> {
-	PageData<MachineVo> page(Page<?> page, @Param("param") Map<String, Object> params);
+	PageData<MachineDTO> page(Map<String, Object> params);
+
+	List<MachineDTO> list(Map<String, Object> params);
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java

@@ -1,9 +1,13 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
+import com.cnbm.basic.dto.PlatformDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Platform;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 站点表
  *
@@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PlatformMapper extends BaseDao<Platform> {
-	
+    List<PlatformDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java

@@ -1,12 +1,14 @@
 package com.cnbm.basic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,4 +20,5 @@ import java.util.Map;
 @Mapper
 public interface ProductTypeMapper extends BaseDao<ProductType> {
     //IPage<ProductTypeDTO> page(IPage<ProductType> objectPage, @Param("param") Map<String, Object> params);
+    List<ProductTypeDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java

@@ -1,9 +1,13 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.FactoryDTO;
+import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.Unit;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 单位 表
  *
@@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UnitMapper extends BaseDao<Unit> {
-	
+    List<UnitDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java

@@ -6,6 +6,7 @@ import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.WorkingProcedure;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,6 @@ import java.util.Map;
  */
 @Mapper
 public interface WorkingProcedureMapper extends BaseDao<WorkingProcedure> {
-    IPage<WorkingProcedureDTO> page(Map<String, Object> params);
+    //IPage<WorkingProcedureDTO> page(Map<String, Object> params);
+    List<WorkingProcedureDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.basic.entity.Factory;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,5 +25,7 @@ public interface IFactoryService extends CrudService<Factory, FactoryDTO> {
 
     void delete(Long[] ids);
 
+    List<FactoryDTO> list();
+
     boolean changeStatus(Long id);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java

@@ -1,11 +1,11 @@
 package com.cnbm.basic.service;
 
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.MachineDTO;
 import com.cnbm.basic.entity.Machine;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,7 +17,7 @@ import java.util.Map;
 public interface IMachineService extends CrudService<Machine, MachineDTO> {
     PageData<MachineDTO> page (Map<String, Object> params);
 
-    PageData<MachineVo> page1 (Map<String, Object> params);
+    PageData<MachineDTO> page1 (Map<String, Object> params);
 
     MachineDTO get(Long id);
 
@@ -27,5 +27,7 @@ public interface IMachineService extends CrudService<Machine, MachineDTO> {
 
     void delete(Long[] ids);
 
+    List<MachineDTO> list(Map<String, Object> params);
+
     boolean changeStatus(Long id);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.PlatformDTO;
 import com.cnbm.basic.entity.Platform;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,5 +25,7 @@ public interface IPlatformService extends CrudService<Platform, PlatformDTO> {
 
     void delete(Long[] ids);
 
+    List<PlatformDTO> list();
+
     boolean changeStatus(Long id);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java

@@ -1,10 +1,12 @@
 package com.cnbm.basic.service;
 
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.basic.entity.ProductType;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,5 +26,7 @@ public interface IProductTypeService extends CrudService<ProductType, ProductTyp
 
     void delete(Long[] ids);
 
+    List<ProductTypeDTO> list();
+
     boolean changeStatus(Long id);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java

@@ -1,10 +1,12 @@
 package com.cnbm.basic.service;
 
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.basic.entity.Unit;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,5 +24,7 @@ public interface IUnitService extends CrudService<Unit, UnitDTO> {
 
     void update(UnitDTO dto);
 
+    List<UnitDTO> list();
+
     boolean changeStatus(Long id);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java

@@ -28,4 +28,6 @@ public interface IWorkingProcedureService extends CrudService<WorkingProcedure,
     boolean changeStatus(Long id);
 
     List<WorkingProcedureDTO> getWorkingProcedureByProductId(Long productId);
+
+    List<WorkingProcedureDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.MachineDTO;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.basic.entity.ProductType;
 import com.cnbm.common.page.PageData;
@@ -13,11 +14,13 @@ import com.cnbm.basic.entity.Factory;
 import com.cnbm.basic.service.IFactoryService;
 import com.cnbm.common.utils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +31,7 @@ import java.util.Map;
  */
 @Service
 public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory, FactoryDTO> implements IFactoryService {
+@Autowired private FactoryMapper mapper;
 
     @Override
     public QueryWrapper<Factory> getWrapper(Map<String, Object> params){
@@ -90,4 +94,11 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
         return updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<FactoryDTO> list() {
+        List<FactoryDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.basic.entity.Platform;
-import com.cnbm.basic.vo.MachineVo;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.MachineDTO;
@@ -20,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -59,7 +59,7 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
             for (MachineDTO machineDTO : machineDTOPageData.getList()) {
                 Platform platform = platformService.selectById(machineDTO.getPlatformId());
                 String platformName = null;
-                if (platformName != null) {
+                if (platform != null) {
                     platformName = platform.getName();
 
                 }
@@ -70,13 +70,12 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
     }
 
     @Override
-    public PageData<MachineVo> page1 (Map<String, Object> params){
+    public PageData<MachineDTO> page1 (Map<String, Object> params){
 //        IPage<Machine> page = baseDao.selectPage(
 //                getPage(params, "id", true),
 //                getWrapper(params)
 //        );
-        return mapper.page(new Page<>(Integer.parseInt(params.get("page").toString()), Integer.parseInt(params.get("limit").toString())),
+        return mapper.page(params);
-                params);
     }
 
 
@@ -118,4 +117,11 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
         return updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<MachineDTO> list(Map<String, Object> params) {
+        List<MachineDTO> list = mapper.list(params);
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.PlatformDTO;
@@ -11,11 +12,13 @@ import com.cnbm.basic.entity.Platform;
 import com.cnbm.basic.service.IPlatformService;
 import com.cnbm.common.utils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,6 +29,8 @@ import java.util.Map;
  */
 @Service
 public class PlatformServiceImpl extends CrudServiceImpl<PlatformMapper, Platform, PlatformDTO> implements IPlatformService {
+@Autowired
+private PlatformMapper mapper;
 
     @Override
     public QueryWrapper<Platform> getWrapper(Map<String, Object> params){
@@ -82,5 +87,12 @@ public class PlatformServiceImpl extends CrudServiceImpl<PlatformMapper, Platfor
         return updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<PlatformDTO> list() {
+        List<PlatformDTO> list = mapper.list();
+        return list;
+    }
+
 
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.admin.dto.SysDictDataDTO;
 import com.cnbm.admin.entity.SysDictDataEntity;
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,9 +34,8 @@ import java.util.Map;
 @Service
 public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, ProductType, ProductTypeDTO> implements IProductTypeService {
 
-
+    @Autowired
-    //@Autowired
+    private ProductTypeMapper mapper;
-    //private ProductTypeMapper productTypeMapper;
 
     @Override
     public QueryWrapper<ProductType> getWrapper(Map<String, Object> params){
@@ -94,4 +95,10 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
         return updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ProductTypeDTO> list() {
+        List<ProductTypeDTO> list = mapper.list();
+        return list;
+    }
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.UnitDTO;
@@ -10,10 +11,12 @@ import com.cnbm.basic.entity.Unit;
 import com.cnbm.basic.mapper.UnitMapper;
 import com.cnbm.basic.service.IUnitService;
 import com.cnbm.common.utils.ConvertUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,6 +27,8 @@ import java.util.Map;
  */
 @Service
 public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO> implements IUnitService {
+    @Autowired
+    private UnitMapper mapper;
 
     @Override
     public QueryWrapper<Unit> getWrapper(Map<String, Object> params){
@@ -72,4 +77,12 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
         entity.setStatus(status);
         return updateById(entity);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<UnitDTO> list() {
+        List<UnitDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java

@@ -3,9 +3,12 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.UnitDTO;
+import com.cnbm.basic.entity.Machine;
 import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
 import com.cnbm.basic.entity.WorkingProcedureType;
 import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper;
+import com.cnbm.basic.mapper.UnitMapper;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
@@ -59,7 +62,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
                 getWrapper(params)
         );
         PageData<WorkingProcedureDTO> workingProcedureDTOPageData = getPageData(page, WorkingProcedureDTO.class);
-        if(workingProcedureDTOPageData.getList().isEmpty()){
+        if(!workingProcedureDTOPageData.getList().isEmpty()){
             for(WorkingProcedureDTO workingProcedureDTO:workingProcedureDTOPageData.getList()){
                 //工序类型 id,关联working_procedure_type表
                 WorkingProcedureType workingProcedureType = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId());
@@ -77,9 +80,10 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
                     for(String machineId:machineIdList){
                         //QueryWrapper<Machine> machineQueryWrapper = new QueryWrapper<>();
                         //machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId);
-                        String machineName = machineServiceImpl.selectById(machineId).getName();
+                        //String machineName = null;
-                        if(machineName!=null) {
+                        Machine machine = machineServiceImpl.selectById(machineId);
-                            machineList.add(machineName);
+                        if(machine!=null&&machine.getName()!=null) {
+                            machineList.add(machine.getName());
                         }
                     }
                     String machineNameList = String.join(",", machineList);
@@ -145,4 +149,15 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
         return workingProcedureDTOList;
     }
 
+
+    @Autowired
+    private WorkingProcedureMapper workingProcedureMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<WorkingProcedureDTO> list() {
+        List<WorkingProcedureDTO> list =  workingProcedureMapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java

@@ -1,45 +0,0 @@
-package com.cnbm.basic.vo;
-
-import com.cnbm.basic.dto.MachineDTO;
-import com.cnbm.common.page.PageData;
-import com.cnbm.common.vo.CommonVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-/**
- * 机台表
- *
- * @author yanyang
- * @since  2022-08-02
- */
-
-@Data
-@ApiModel(value = "机台表DTO对象")
-public class MachineVo extends MachineDTO {
-//    private static final long serialVersionUID = 1L;
-
-
-//    @ApiModelProperty(value = "ID")
-//    private Long id;
-//
-//    @ApiModelProperty(value = "机台名")
-//    private String name;
-//
-//    @ApiModelProperty(value = "机台编码")
-//    private String code;
-//
-//    @ApiModelProperty(value = "机台id，关联platform id")
-//    private Long platformId;
-
-    @ApiModelProperty(value = "机台名称，关联platform id")
-    private String platformName;
-
-//    @ApiModelProperty(value = "1 可用，0 不可用")
-//    private Integer status;
-//
-//    @ApiModelProperty(value = "备注")
-//    private String remark;
-
-}

ym-baisc/src/main/resources/mapper/FactoryMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.FactoryMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.FactoryDTO">
+        select * from factory
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/MachineMapper.xml

@@ -10,6 +10,7 @@
         <result column="STATUS" property="status" />
         <result column="platformName" property="platformName" />
     </resultMap>
+
     <select id="page" resultMap="BaseResultMap">
         select m.id,m.code,m.name,m.remark,m.status,p.name as platformName
         from machine m
@@ -18,4 +19,16 @@
 
         </where>
     </select>
+
+    <select id="list" resultType="com.cnbm.basic.dto.MachineDTO">
+        select m.id,m.code,m.name,m.remark,m.status,p.name as platformName
+        from machine m
+        LEFT JOIN platform p ON p.id=m.platform_id
+        <where>
+            <if test="status != null">
+                and m.status = #{status}
+            </if>
+        </where>
+        order by m.id asc
+    </select>
 </mapper>

ym-baisc/src/main/resources/mapper/PlatformMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.PlatformMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.PlatformDTO">
+        select * from platform
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.ProductTypeMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.ProductTypeDTO">
+        select * from product_type
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/UnitMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.UnitMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.UnitDTO">
+        select * from unit
+        order by id asc
+    </select>
+
 </mapper>

ym-baisc/src/main/resources/mapper/WorkingProcedureMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.WorkingProcedureMapper">
 
+    <select id="list" resultType="com.cnbm.basic.dto.WorkingProcedureDTO">
+        select * from working_procedure
+        order by id asc
+    </select>
+
 </mapper>