优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -22,6 +22,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private String cptcode;//采购类型
+
     private String cdepcode;//部门编码
     private String cbustype;//业务类型
 

platform-dao/src/main/java/com/platform/dao/dto/spareAdd/LongYanSpareAddDTO.java

@@ -0,0 +1,62 @@
+package com.platform.dao.dto.spareAdd;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 图层目录表DTO
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class LongYanSpareAddDTO extends BaseDTO implements Serializable {
+
+      /**
+     * 
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 存货分类
+     */
+          private String category;
+          /**
+     * 存货大类
+     */
+          private String bigCategory;
+          /**
+     * 物料名称
+     */
+          private String name;
+          /**
+     * 规格型号
+     */
+          private String ggxh;
+          /**
+     * 计量单位
+     */
+          private String unit;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 
+     */
+          private Integer status;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseOrder.java

@@ -22,6 +22,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private String cptcode;//采购类型
     private String cdepcode;//部门编码
 
     private String cbustype;//业务类型

platform-dao/src/main/java/com/platform/dao/entity/spareAdd/LongYanSpareAdd.java

@@ -0,0 +1,65 @@
+package com.platform.dao.entity.spareAdd;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+
+/**
+ * @Description 图层目录表实体类
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_long_yan_spare_add")
+public class LongYanSpareAdd implements Serializable{
+
+    /**
+     * 
+     */
+        @Id
+    private String id;
+    /**
+     * 存货分类
+     */
+    private String category;
+    /**
+     * 存货大类
+     */
+    private String bigCategory;
+    /**
+     * 物料名称
+     */
+    private String name;
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+    /**
+     * 计量单位
+     */
+    private String unit;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 
+     */
+    private Integer status;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/spareAdd/LongYanSpareAddMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.spareAdd;
+
+import com.platform.dao.dto.spareAdd.LongYanSpareAddDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
+import com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 图层目录表 mapper
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface LongYanSpareAddMapper extends MyMapper<LongYanSpareAdd> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<LongYanSpareAddVO> selectList(LongYanSpareAddDTO dto);
+
+}

platform-dao/src/main/java/com/platform/dao/vo/export/spareAdd/ExportLongYanSpareAddVO.java

@@ -0,0 +1,69 @@
+package com.platform.dao.vo.export.spareAdd;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 图层目录表导出VO
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportLongYanSpareAddVO implements Serializable {
+
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "1")
+      private String id;
+    
+    /**
+   * 存货分类
+   */
+          @Excel(name = "存货分类", orderNum = "2")
+      private String category;
+    
+    /**
+   * 存货大类
+   */
+          @Excel(name = "存货大类", orderNum = "3")
+      private String bigCategory;
+    
+    /**
+   * 物料名称
+   */
+          @Excel(name = "物料名称", orderNum = "4")
+      private String name;
+    
+    /**
+   * 规格型号
+   */
+          @Excel(name = "规格型号", orderNum = "5")
+      private String ggxh;
+    
+    /**
+   * 计量单位
+   */
+          @Excel(name = "计量单位", orderNum = "6")
+      private String unit;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "7")
+      private String remark;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "8")
+      private Integer status;
+    
+  
+}

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private String cptcode;//采购类型
+
     private String cdepcode;//部门编码
 
     private String cbustype;//业务类型

platform-dao/src/main/java/com/platform/dao/vo/query/spareAdd/LongYanSpareAddVO.java

@@ -0,0 +1,60 @@
+package com.platform.dao.vo.query.spareAdd;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 图层目录表VO结果类
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class LongYanSpareAddVO extends BaseVO implements Serializable{
+
+    /**
+     * 
+     */
+        private String id;
+        /**
+     * 存货分类
+     */
+        private String category;
+        /**
+     * 存货大类
+     */
+        private String bigCategory;
+        /**
+     * 物料名称
+     */
+        private String name;
+        /**
+     * 规格型号
+     */
+        private String ggxh;
+        /**
+     * 计量单位
+     */
+        private String unit;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 
+     */
+        private Integer status;
+    
+
+
+}

platform-dao/src/main/resources/mapper/spareAdd/LongYanSpareAddMapper.xml

@@ -0,0 +1,59 @@
+<?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="com.platform.dao.mapper.spareAdd.LongYanSpareAddMapper">
+    <sql id="Base_Column_List">
+                             spareAdd.id,
+                                     spareAdd.category,
+                                     spareAdd.big_category,
+                                     spareAdd.name,
+                                     spareAdd.ggxh,
+                                     spareAdd.unit,
+                                     spareAdd.remark,
+                                     spareAdd.status
+                        </sql>
+    <sql id="Ref_Column_List">
+                                                                         spareAdd.category,
+                                     spareAdd.big_category,
+                                     spareAdd.name,
+                                     spareAdd.ggxh,
+                                     spareAdd.unit,
+                                     spareAdd.remark,
+                                     spareAdd.status
+                                </sql>
+    <sql id="List_Condition">
+                                    <if test="id != null and id != ''">
+                    and spareAdd.id = #{id}
+                </if>
+                                                <if test="category != null and category != ''">
+                    and spareAdd.category = #{category}
+                </if>
+                                                <if test="bigCategory != null and bigCategory != ''">
+                    and spareAdd.big_category = #{bigCategory}
+                </if>
+                                                <if test="name != null and name != ''">
+                    and spareAdd.name = #{name}
+                </if>
+                                                <if test="ggxh != null and ggxh != ''">
+                    and spareAdd.ggxh = #{ggxh}
+                </if>
+                                                <if test="unit != null and unit != ''">
+                    and spareAdd.unit = #{unit}
+                </if>
+                                                <if test="remark != null and remark != ''">
+                    and spareAdd.remark = #{remark}
+                </if>
+                                                <if test="status != null">
+                    and spareAdd.status = #{status}
+                </if>
+                            <if test="keyword != null and keyword != ''">
+            and spareAdd.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.spareAdd.LongYanSpareAddDTO" resultType="com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO">
+        select spareAdd.*
+                                                                                                                                                                                from t_long_yan_spare_add as spareAdd
+                                                                                                                                                                                <where>
+            <include refid="List_Condition" />
+        </where>
+    </select>
+</mapper>

platform-rest/src/main/java/com/platform/rest/controller/spareAdd/LongYanSpareAddController.java

@@ -0,0 +1,141 @@
+package com.platform.rest.controller.spareAdd;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.spareAdd.LongYanSpareAddDTO;
+import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
+import com.platform.service.spareAdd.LongYanSpareAddService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.spareAdd.ExportLongYanSpareAddVO;
+import com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 图层目录表 控制器
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/spareAdd/spareAdd")
+public class LongYanSpareAddController {
+
+  private final  LongYanSpareAddService longYanSpareAddService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<LongYanSpareAdd> getById(@PathVariable("id") String id){
+      return new R<>(longYanSpareAddService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param longYanSpareAddDTO 图层目录表DTO
+   * @return R
+   */
+  @SysLog("新增图层目录表")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('spareAdd-spareAdd-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody LongYanSpareAddDTO longYanSpareAddDTO) {
+      return new R<>(longYanSpareAddService.saveModelByDTO(longYanSpareAddDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param longYanSpareAddDTO 图层目录表DTO
+   * @return R
+   */
+  @SysLog("修改图层目录表")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('spareAdd-spareAdd-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody LongYanSpareAddDTO longYanSpareAddDTO) {
+      longYanSpareAddService.modModelByDTO(longYanSpareAddDTO);
+      return new R<>();
+  }
+
+
+                                                  
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除图层目录表")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('spareAdd-spareAdd-del')")
+  public R removeById(@PathVariable String id){
+    longYanSpareAddService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除图层目录表")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('spareAdd-spareAdd-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        longYanSpareAddService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param longYanSpareAddDTO 图层目录表DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<LongYanSpareAddVO>> query(LongYanSpareAddDTO longYanSpareAddDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(longYanSpareAddService.selectPageList(longYanSpareAddDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param longYanSpareAddDTO 图层目录表DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(LongYanSpareAddDTO longYanSpareAddDTO) {
+      return new R<>(longYanSpareAddService.getModelListByDTO(longYanSpareAddDTO));
+  }
+
+  /**
+     * 图层目录表导出
+     *
+     * @param longYanSpareAddDTO 图层目录表DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("图层目录表导出")
+  @PreAuthorize("@pms.hasPermission('spareAdd-spareAdd-export')")
+  public void export(HttpServletResponse response, LongYanSpareAddDTO longYanSpareAddDTO) {
+    List<LongYanSpareAdd> list = longYanSpareAddService.getModelListByDTO(longYanSpareAddDTO);
+    ExcelUtil.exportResponseDict(response, ExportLongYanSpareAddVO.class, BeanConverterUtil.copyListProperties(list, ExportLongYanSpareAddVO.class), "图层目录表");
+  }
+
+}

platform-service/src/main/java/com/platform/service/spareAdd/LongYanSpareAddService.java

@@ -0,0 +1,35 @@
+package com.platform.service.spareAdd;
+
+import com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO;
+import com.platform.dao.dto.spareAdd.LongYanSpareAddDTO;
+import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 图层目录表 service
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface LongYanSpareAddService extends IBaseService<LongYanSpareAdd, LongYanSpareAddDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids ：
+    * @return ：
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<LongYanSpareAddVO> selectPageList(LongYanSpareAddDTO record, int pageNum, int pageSize);
+
+                                                                                                    }

platform-service/src/main/java/com/platform/service/spareAdd/impl/LongYanSpareAddServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.spareAdd.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO;
+import com.platform.dao.dto.spareAdd.LongYanSpareAddDTO;
+import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
+import com.platform.dao.mapper.spareAdd.LongYanSpareAddMapper;
+import com.platform.service.spareAdd.LongYanSpareAddService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 图层目录表 service 实现类
+ * @Author lsq
+ * @Date 2023-07-25 15:59:52
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("longYanSpareAddService")
+public class LongYanSpareAddServiceImpl extends BaseServiceImpl<LongYanSpareAddMapper, LongYanSpareAdd, LongYanSpareAddDTO> implements LongYanSpareAddService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<LongYanSpareAdd> weekend = new Weekend<>(LongYanSpareAdd.class);
+        WeekendCriteria<LongYanSpareAdd, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(LongYanSpareAdd::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<LongYanSpareAddVO> selectPageList(LongYanSpareAddDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<LongYanSpareAdd> selectPageInfo(LongYanSpareAddDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                                                                    }