Sfoglia il codice sorgente

PC端,技术人员回复咨询

ezhizao 1 anno fa
parent
commit
5e39b6451e

+ 70 - 0
src/main/java/cn/ezhizao/project/business/controller/BizDayworkItemConsultController.java

@@ -0,0 +1,70 @@
+package cn.ezhizao.project.business.controller;
+
+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.domain.BizDayworkItemConsult;
+import cn.ezhizao.project.business.service.IBizDayworkItemConsultService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 咨询Controller
+ *
+ * @author ezhizao
+ * 日期 2023-11-14
+ */
+@RestController
+@RequestMapping("/business/consult")
+public class BizDayworkItemConsultController extends BaseController {
+    @Resource
+    private IBizDayworkItemConsultService iBizDayworkItemConsultService;
+    @Resource
+    private HttpServletRequest request;
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
+        // 分页
+        startPage();
+        List<BizDayworkItemConsult> list = iBizDayworkItemConsultService.getList(data);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取咨询详细信息
+     */
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(iBizDayworkItemConsultService.getById(id));
+    }
+
+    /**
+     * 新增咨询
+     */
+    @Log(title = "咨询", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/save")
+    public AjaxResult save(@RequestBody BizDayworkItemConsult bizDayworkItemConsult) throws NoSuchFieldException, IllegalAccessException {
+        final String tenantId = request.getHeader("tenantId");
+        bizDayworkItemConsult.setTenantId(Long.valueOf(tenantId));
+        return toAjax(iBizDayworkItemConsultService.saveOrUpdate(bizDayworkItemConsult));
+    }
+
+    /**
+     * 删除咨询
+     */
+    @PreAuthorize("@ss.hasPermi('business:consult:remove')")
+    @Log(title = "咨询", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids) {
+        return toAjax(iBizDayworkItemConsultService.removeBatchByIds(ids));
+    }
+}

+ 84 - 0
src/main/java/cn/ezhizao/project/business/domain/BizDayworkItemConsult.java

@@ -0,0 +1,84 @@
+package cn.ezhizao.project.business.domain;
+
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 废品原因对象 biz_daywork_item_consult
+ *
+ * @author zhuangdezheng
+ * date    2024-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "biz_daywork_item_consult")
+public class BizDayworkItemConsult extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "姓名")
+    private String nickName;
+
+    @ApiModelProperty(value = "租户(厂别)id")
+    private Long tenantId;
+
+    @ApiModelProperty(value = "计划单id")
+    private Long productionPlanId;
+
+    @ApiModelProperty(value = "计划单明细id")
+    private Long productionPlanDetailId;
+
+    @ApiModelProperty(value = "子计划id")
+    private Long productionPlanDetailSubDetailId;
+
+    @ApiModelProperty(value = "子计划工序对应的设备id?????????")
+    private Long productionPlanDetailSubDetailEquipmentId;
+
+    @ApiModelProperty(value = "批次id")
+    private Long lotId;
+
+    @ApiModelProperty(value = "批次号")
+    private String lotCode;
+
+    @ApiModelProperty(value = "daywork的id")
+    private Long dayworkId;
+
+    @ApiModelProperty(value = "报工明细id")
+    private Long dayworkItemId;
+
+    @ApiModelProperty(value = "产品id")
+    private Long productId;
+
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
+    @ApiModelProperty(value = "工艺id(通过工艺id,获取版本号)")
+    private Long technologicalProcessId;
+
+    @ApiModelProperty(value = "当前工序id")
+    private Long technologicalProcessDetailId;
+
+    @ApiModelProperty(value = "报工明细id")
+    private Long processId;
+
+    @ApiModelProperty(value = "工序简称")
+    private String processAlias;
+
+    @ApiModelProperty(value = "咨询的信息")
+    private String content;
+
+    @ApiModelProperty(value = "回复状态 0未回复 1合格 2不合格")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否序检(0否,1是)")
+    private Integer isProcessInspection;
+}

+ 35 - 0
src/main/java/cn/ezhizao/project/business/mapper/BizDayworkItemConsultMapper.java

@@ -0,0 +1,35 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizDayworkItemConsult;
+import cn.ezhizao.project.business.domain.BizInspectionInstruction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 废品原因Mapper接口
+ *
+ * @author ezhizao
+ * @date 2023-12-28
+ */
+public interface BizDayworkItemConsultMapper extends BaseMapper<BizDayworkItemConsult>
+{
+    /**
+     * 查询咨询列表
+     *
+     * @param data 查询条件
+     * @return 废品原因集合
+     */
+    public List<BizDayworkItemConsult> getList(Map<String, Object> data);
+
+    /**
+     * 物理删除
+     *
+     * @param bizDayworkItemConsult 咨询信息
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDayworkItemConsult bizDayworkItemConsult);
+
+
+}

+ 31 - 0
src/main/java/cn/ezhizao/project/business/service/IBizDayworkItemConsultService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.BizDayworkItemConsult;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 检查指导书Service接口
+ *
+ * @author zhuangdezheng
+ * @date 2024-04-22
+ */
+public interface IBizDayworkItemConsultService extends IService<BizDayworkItemConsult> {
+    /**
+     * 查询检测指导书列表
+     *
+     * @param data 查询条件
+     * @return 检测指导书集合
+     */
+    List<BizDayworkItemConsult> getList(Map<String, Object> data);
+
+    /**
+     * 物理删除
+     *
+     * @param bizDayworkItemConsult 待删除
+     * @return 删除结果
+     */
+    int physicalDelete(BizDayworkItemConsult bizDayworkItemConsult);
+}

+ 45 - 0
src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkItemConsultServiceImpl.java

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizDayworkItemConsult;
+import cn.ezhizao.project.business.mapper.BizDayworkItemConsultMapper;
+import cn.ezhizao.project.business.service.IBizDayworkItemConsultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 检查指导书Service业务层处理
+ *
+ * @author zhuangdezheng
+ * date    2024-04-23
+ */
+@Service
+public class BizDayworkItemConsultServiceImpl extends ServiceImpl<BizDayworkItemConsultMapper, BizDayworkItemConsult> implements IBizDayworkItemConsultService {
+    @Resource
+    private BizDayworkItemConsultMapper bizDayworkItemConsultMapper;
+
+    /**
+     * 查询检测指导书列表
+     *
+     * @param data 查询条件
+     * @return 检测指导书集合
+     */
+    @Override
+    public List<BizDayworkItemConsult> getList(Map<String, Object> data)
+    {
+        return bizDayworkItemConsultMapper.getList(data);
+    }
+
+    /**
+     * 物理删除
+     *
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDayworkItemConsult bizDayworkItemConsult) {
+        return bizDayworkItemConsultMapper.physicalDelete(bizDayworkItemConsult);
+    }
+}

+ 30 - 0
src/main/resources/mybatis/business/BizDayworkItemConsultMapper.xml

@@ -0,0 +1,30 @@
+<?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.mapper.BizDayworkItemConsultMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizDayworkItemConsult" id="BizDayworkItemConsultResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+    <select id="getList" resultMap="BizDayworkItemConsultResult" parameterType="cn.ezhizao.project.business.domain.BizDayworkItemConsult">
+        SELECT t1.*
+        FROM biz_daywork_item_consult t1
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="isProcessInspection != null and isProcessInspection != ''"> AND is_process_inspection = #{isProcessInspection}</if>
+            <if test="lotCode != null and lotCode != ''"> AND lot_code LIKE CONCAT('%', #{lotCode}, '%')</if>
+            <if test="content != null and content != ''"> AND content LIKE CONCAT('%', #{content}, '%')</if>
+            <if test="keywords != null and keywords != ''"> AND product_description LIKE CONCAT('%', #{keywords}, '%')</if>
+        </trim>
+
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_daywork_item_consult WHERE deleted = 0
+        <if test="id != null">
+            AND id = #{id}
+        </if>
+    </delete>
+</mapper>