Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierCategoryController.java

@@ -37,22 +37,22 @@ public class BizCarrierCategoryController extends BaseController {
      * 查询载具类别列表
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
-    @PostMapping("/list")
-    public TableDataInfo list() throws NoSuchFieldException, IllegalAccessException {
+    @GetMapping("/list")
+    public TableDataInfo list(BizCarrierCategory bizCarrierCategory) throws NoSuchFieldException, IllegalAccessException {
         Integer zero = 0;
         String tenantId = request.getHeader("tenantId");
-        QueryWrapper<BizCarrierCategory> queryWrapper = new QueryWrapper<>();
-        // 获取所有一级类别
-        queryWrapper.eq("parent_id", zero);
-        if (tenantId != null && !zero.toString().equals(tenantId)) {
-            queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
 
-        }
-        List<BizCarrierCategory> list = iBizCarrierCategoryService.list(queryWrapper);
-        iBizCarrierCategoryService.getChildren(list);
-        return getDataTable(list);
-    }
+            QueryWrapper<BizCarrierCategory> queryWrapper = new QueryWrapper<>();
+            // 获取所有一级类别
+            queryWrapper.eq("parent_id", zero);
+            if (tenantId != null && !zero.toString().equals(tenantId)) {
+                queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
+            }
+            List<BizCarrierCategory> list = iBizCarrierCategoryService.list(queryWrapper);
+            iBizCarrierCategoryService.getChildren(list);
+            return getDataTable(list);
 
+    }
     /**
      * 获取载具类别详细信息
      */

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierRejectController.java

@@ -0,0 +1,99 @@
+package cn.ezhizao.project.business.carrier.controller;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+
+import cn.ezhizao.project.business.carrier.domain.BizCarrierReject;
+import cn.ezhizao.project.business.carrier.service.IBizCarrierRejectService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 企业租户Controller
+ *
+ * @author ezhizao
+ * @date 2024-01-09
+ */
+@RestController
+@RequestMapping("/business/carrierReject")
+public class BizCarrierRejectController extends BaseController
+{
+    @Resource
+    private IBizCarrierRejectService bizCarrierRejectService;
+
+    /**
+     * 查询企业租户列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:carrierReject:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
+    {
+        startPage();
+        List<BizCarrierReject> list = bizCarrierRejectService.getList(bizCarrierReject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出企业租户列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:carrierReject:export')")
+    @Log(title = "企业租户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
+    {
+        List<BizCarrierReject> list = bizCarrierRejectService.getList(bizCarrierReject);
+        ExcelUtil<BizCarrierReject> util = new ExcelUtil<BizCarrierReject>(BizCarrierReject.class);
+        util.exportExcel(response, list, "企业租户数据");
+    }
+
+    /**
+     * 获取企业租户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('business:carrierReject:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizCarrierRejectService.getById(id));
+    }
+
+    /**
+     * 新增企业租户
+     */
+    @PreAuthorize("@ss.hasPermi('business:carrierReject:add')")
+    @Log(title = "企业租户", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/save")
+    public AjaxResult add(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
+    {
+        return toAjax(bizCarrierRejectService.save(bizCarrierReject));
+    }
+
+    /**
+     * 修改企业租户
+     */
+    @PreAuthorize("@ss.hasPermi('business:reject:edit')")
+    @Log(title = "企业租户", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
+    {
+        return toAjax(bizCarrierRejectService.updateById(bizCarrierReject));
+    }
+
+    /**
+     * 删除企业租户
+     */
+    @PreAuthorize("@ss.hasPermi('business:reject:remove')")
+    @Log(title = "企业租户", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizCarrierRejectService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/carrier/domain/BizCarrierReject.java

@@ -0,0 +1,51 @@
+package cn.ezhizao.project.business.carrier.domain;
+
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 企业租户对象 biz_carrier_reject
+ *
+ * @author ezhizao
+ * @date 2024-01-09
+ */
+@Data
+@TableName(value = "biz_carrier_reject")
+public class BizCarrierReject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 载具的id */
+    @ApiModelProperty(value = "${comment}")
+    private Long carrierId;
+
+    /** 废品原因 */
+    @ApiModelProperty(value = "废弃原因")
+    private String abandonmentReason;
+
+    /** 载具状态 */
+    @ApiModelProperty(value = "载具状态")
+    private Integer isAbandoned;
+
+
+    /** 报废日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "操作日期")
+    private Date operationDate;
+
+    @TableField(exist = false)
+    private Long categoryId;
+
+    @TableField(exist = false)
+    private String code;
+
+
+}

src/main/java/cn/ezhizao/project/business/carrier/mapper/BizCarrierRejectMapper.java

@@ -0,0 +1,32 @@
+package cn.ezhizao.project.business.carrier.mapper;
+
+
+import cn.ezhizao.project.business.carrier.domain.BizCarrierReject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+
+/**
+ * 企业租户Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-01-09
+ */
+public interface BizCarrierRejectMapper extends BaseMapper<BizCarrierReject>
+{
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizCarrierReject 企业租户
+     * @return 企业租户集合
+     */
+    public List<BizCarrierReject> getList(BizCarrierReject bizCarrierReject);
+
+    /**
+     * 物理删除
+     * @param bizCarrierReject
+     * @return 删除结果
+    */
+    public int physicalDelete(BizCarrierReject bizCarrierReject);
+}

src/main/java/cn/ezhizao/project/business/carrier/service/IBizCarrierRejectService.java

@@ -0,0 +1,33 @@
+package cn.ezhizao.project.business.carrier.service;
+
+
+import cn.ezhizao.project.business.carrier.domain.BizCarrierReject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+
+/**
+ * 企业租户Service接口
+ *
+ * @author ezhizao
+ * @date 2024-01-09
+ */
+public interface IBizCarrierRejectService extends IService<BizCarrierReject>
+{
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizCarrierReject 企业租户
+     * @return 企业租户集合
+     */
+    public List<BizCarrierReject> getList(BizCarrierReject bizCarrierReject);
+
+    /**
+     * 物理删除
+     * @param bizCarrierReject
+     * @return 删除结果
+     */
+    public int physicalDelete(BizCarrierReject bizCarrierReject);
+
+}

src/main/java/cn/ezhizao/project/business/carrier/service/impl/BizCarrierRejectServiceImpl.java

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.carrier.service.impl;
+
+
+import cn.ezhizao.project.business.carrier.domain.BizCarrierReject;
+import cn.ezhizao.project.business.carrier.mapper.BizCarrierRejectMapper;
+import cn.ezhizao.project.business.carrier.service.IBizCarrierRejectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 企业租户Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-01-09
+ */
+@Service
+public class BizCarrierRejectServiceImpl extends ServiceImpl<BizCarrierRejectMapper, BizCarrierReject> implements IBizCarrierRejectService
+{
+    @Resource
+    private BizCarrierRejectMapper bizCarrierRejectMapper;
+
+    /**
+     * 查询企业租户列表
+     *
+     * @param bizCarrierReject 企业租户
+     * @return 企业租户
+     */
+    @Override
+    public List<BizCarrierReject> getList(BizCarrierReject bizCarrierReject)
+    {
+        return bizCarrierRejectMapper.getList(bizCarrierReject);
+    }
+
+    /**
+     * 物理删除
+     * @param bizCarrierReject
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizCarrierReject bizCarrierReject){ return bizCarrierRejectMapper.physicalDelete(bizCarrierReject); };
+
+}

src/main/resources/mybatis/business/carrier/BizCarrierMapper.xml

@@ -9,12 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="getList" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.carrier.domain.BizCarrier">
-        select * from biz_carrier
+        select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
+        FROM biz_carrier t1
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="categoryId != null  and categoryId != 0"> AND category_id = #{categoryId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="code != null  and code != 0"> AND code LIKE CONCAT('%', #{code}, '%')</if>
+
         </trim>
 
     </select>

src/main/resources/mybatis/business/carrier/BizCarrierRejectMapper.xml

@@ -0,0 +1,32 @@
+<?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="cn.ezhizao.project.business.carrier.mapper.BizCarrierRejectMapper">
+
+    <resultMap type="cn.ezhizao.project.business.carrier.domain.BizCarrierReject" id="BizCarrierRejectResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizCarrierReject" resultMap="BizCarrierRejectResult">
+        SELECT t1.*,t2.code FROM biz_carrier_reject t1 left join biz_carrier t2 on t1.carrier_id = t2.id
+        left join biz_carrier_category t3 on t2.category_id = t3.id
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="categoryId != null  and categoryId != ''"> AND category_id = #{categoryId}</if>
+            <if test="code != null  and code != ''"> AND t2.code like concat('%',#{code},'%')</if>
+            <if test="isAbandoned != null "> AND t1.is_abandoned = #{isAbandoned}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_carrier_reject
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>