From 3dbab6ae6ec15f46326492002f570ff98b988cec Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 11:20:01 +0800
Subject: [PATCH] 清除检验委托单
---
/dev/null | 202 --------------------------------------------------
1 files changed, 0 insertions(+), 202 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderController.java
deleted file mode 100644
index 280c980..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.process.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.process.dto.ProcessOrderDto;
-import com.ruoyi.process.pojo.ProcessOrder;
-import com.ruoyi.process.service.ProcessOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * <p>
- * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-11-05 03:06:20
- */
-@RestController
-@RequestMapping("/processOrder")
-@Api(tags = "瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
-public class ProcessOrderController {
-
- @Resource
- private ProcessOrderService processOrderService;
-
- @ApiOperation(value = "鏌ヨ瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫鍒楄〃")
- @GetMapping("/pageProcessOrder")
- public Result pageProcessOrder(ProcessOrderDto processOrderDto ,Page page) throws Exception {
- return Result.success(processOrderService.pageProcessOrder(page, processOrderDto));
- }
-
- @ApiOperation(value = "鍒犻櫎瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
- @DeleteMapping("/delProcessOrder")
- public Result delProcessOrder(Long id) {
- return Result.success(processOrderService.removeById(id));
- }
-
- @ApiOperation(value = "淇敼瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
- @PostMapping("/doProcessOrder")
- public Result doProcessOrder(@RequestBody ProcessOrder processOrder) {
- return Result.success(processOrderService.doProcessOrder(processOrder));
- }
-
- @ApiOperation(value = "鏌ョ湅璇︽儏瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
- @GetMapping("/getProcessOrder")
- public Result getProcessOrder(Integer id) {
- return Result.success(processOrderService.getProcessOrder(id));
- }
-
-
-// /**
-// * 瀵煎嚭妫�楠屽鎵樺崟
-// * @return
-// */
-// @ValueAuth
-// @ApiOperation(value = "瀵煎嚭妫�楠屽鎵樺崟")
-// @PostMapping("/exportInspectionOrder")
-// public void exportInspectionOrder(Integer id, HttpServletResponse response){
-// processOrderService.exportInspectionOrder(id, response);
-// }
-
-
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessOrderDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessOrderDto.java
deleted file mode 100644
index 3d993e5..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessOrderDto.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.ruoyi.process.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.ruoyi.process.pojo.ProcessOrder;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-//瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫鐨勬煡鐪嬭鎯�
-public class ProcessOrderDto extends ProcessOrder {
-
- @ApiModelProperty(value = "濮旀墭缂栧彿")
- private String entrustCode;
-
- @ApiModelProperty("璇曟牱鍚嶇О")
- private String sample;
-
- @ApiModelProperty("濮旀墭鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @ApiModelProperty("鍨嬪彿")
- private String sampleType;
-
- @ApiModelProperty("濮旀墭鍗曚綅")
- private String company;
-
- @ApiModelProperty("鐢熶骇鍗曚綅")
- private String production;
-
- @ApiModelProperty("鐢熸垚鍗曚綅en")
- private String productionEn;
-
- @ApiModelProperty("濮旀墭浜�")
- private String prepareUser;
-
- private String prepareUserUrl;
-
- @ApiModelProperty("鏍峰搧鏁伴噺")
- private String sampleNum;
-
- @ApiModelProperty("鏍峰搧鐘舵��")
- private Integer insState;
-
- private String sampleStatus;
-
- @ApiModelProperty("鏄惁鐣欐牱")
- private Integer isLeave;
-
- @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
- private Integer processing;
-
- @ApiModelProperty("鑱旂郴鏂瑰紡")
- private String phone;
-
- @ApiModelProperty("绾﹀畾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointed;
-
- @ApiModelProperty("鎶ュ憡鍙戦�佹柟寮�")
- private Integer send;
-
- //鏍峰搧鍜屾楠岄」鐩俊鎭�
- private List<SampleItemDto> sampleItems;
-
-
-
-
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderMapper.java
deleted file mode 100644
index 6e83ca6..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.process.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.process.dto.ProcessOrderDto;
-import com.ruoyi.process.pojo.InspectionOrderDetail;
-import com.ruoyi.process.pojo.ProcessOrder;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫 Mapper 鎺ュ彛
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-11-05 03:06:20
- */
-public interface ProcessOrderMapper extends BaseMapper<ProcessOrder> {
-
- IPage<ProcessOrderDto> pageProcessOrder(Page page, @Param("ew") QueryWrapper<ProcessOrderDto> queryWrappers);
-
- ProcessOrderDto getProcessOrder(Integer id);
-
- List<InspectionOrderDetail> selectInsOrder(Integer insOrderId);
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java
deleted file mode 100644
index fee4d24..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.process.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-/**
- * <p>
- * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-11-05 03:06:20
- */
-@Getter
-@Setter
-@TableName("cnas_process_order")
-@ApiModel(value = "ProcessOrder瀵硅薄", description = "瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
-public class ProcessOrder implements Serializable {
-
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("鍏宠仈澶栭敭(妫�楠屽崟id)")
- private Integer insOrderId;
-
- @ApiModelProperty("鍒ゅ畾瑙勫垯:涓嶈�冭檻涓嶇‘瀹氬害/鑰冭檻涓嶇‘瀹氬害(%)")
- private String rule;
-
- @ApiModelProperty("缁煎悎瀹ょ鍚嶄汉")
- private Integer comprehensiveUser;
-
- @TableField(select = false,exist = false)
- private String comprehensiveUserName;
-
- @TableField(select = false,exist = false)
- private String comprehensiveUserUrl;
-
- @ApiModelProperty("鎺ユ敹鏃ユ湡")
- private LocalDate comprehensiveTime;
-
- @ApiModelProperty("棰嗘牱鍛�")
- private Integer issueUser;
-
- @TableField(select = false,exist = false)
- private String issueUserName;
-
- @TableField(select = false,exist = false)
- private String issueUserUrl;
-
- @ApiModelProperty("棰嗘牱鏃ユ湡")
- private LocalDate issueTime;
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java
deleted file mode 100644
index 82917be..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.process.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.process.dto.ProcessOrderDto;
-import com.ruoyi.process.pojo.ProcessOrder;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-
-/**
- * <p>
- * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫 鏈嶅姟绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-11-05 03:06:20
- */
-public interface ProcessOrderService extends IService<ProcessOrder> {
-
- IPage<ProcessOrderDto> pageProcessOrder(Page page, ProcessOrderDto processOrderDto);
-
- ProcessOrderDto getProcessOrder(Integer id);
-
- int doProcessOrder(ProcessOrder processOrder);
-
- void exportInspectionOrder(Integer id, HttpServletResponse response);
-}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
deleted file mode 100644
index 709d26b..0000000
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.ruoyi.process.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.mapper.InsOrderMapper;
-import com.ruoyi.process.dto.InspectionOrderExportDto;
-import com.ruoyi.process.dto.ProcessOrderDto;
-import com.ruoyi.process.mapper.ProcessOrderMapper;
-import com.ruoyi.process.pojo.ProcessOrder;
-import com.ruoyi.process.service.ProcessOrderService;
-import com.ruoyi.system.mapper.UserMapper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>
- * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2024-11-05 03:06:20
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class ProcessOrderServiceImpl extends ServiceImpl<ProcessOrderMapper, ProcessOrder> implements ProcessOrderService {
-
- @Resource
- private ProcessOrderMapper processOrderMapper;
-
- @Resource
- InsOrderMapper insOrderMapper;
-
- @Resource
- private UserMapper userMapper;
-
- @Override
- public IPage<ProcessOrderDto> pageProcessOrder(Page page, ProcessOrderDto processOrderDto) {
-
- return processOrderMapper.pageProcessOrder(page, QueryWrappers.queryWrappers(processOrderDto));
- }
-
- @Override
- public ProcessOrderDto getProcessOrder(Integer id) {
- return processOrderMapper.getProcessOrder(id);
- }
-
- @Override
- public int doProcessOrder(ProcessOrder processOrder) {
- if (ObjectUtils.isNotEmpty(processOrder.getComprehensiveUser())) {
- User user = userMapper.selectById(processOrder.getComprehensiveUser());
- if (ObjectUtils.isEmpty(user.getSignatureUrl())) throw new ErrorException("鏈壘鍒扮患鍚堝绛惧悕浜虹殑鐢靛瓙绛惧悕,璇蜂笂浼犵數瀛愮鍚�!");
- }
- if (ObjectUtils.isNotEmpty(processOrder.getIssueUser())) {
- User user = userMapper.selectById(processOrder.getIssueUser());
- if (ObjectUtils.isEmpty(user.getSignatureUrl())) throw new ErrorException("鏈壘鍒伴鏍峰憳鐨勭數瀛愮鍚�,璇蜂笂浼犵數瀛愮鍚�!");
- }
- return processOrderMapper.updateById(processOrder);
- }
-
-
- @Override
- public void exportInspectionOrder(Integer id, HttpServletResponse response) {
-// ProcessOrder processOrder = baseMapper.selectById(id);
-// InspectionOrderExportDto inspectionOrderExportDto = extracted(processOrder);
-// List<InspectionOrderDetail> list = baseMapper.selectInsOrder(processOrder.getInsOrderId());
-// int index = 1;
-// for (InspectionOrderDetail inspectionOrderDetail : list) {
-// inspectionOrderDetail.setIndex(index);
-// index++;
-// }
-//
-// // 鑾峰彇璺緞
-// InputStream inputStream = this.getClass().getResourceAsStream("/static/inspection-order.docx");
-// Configure configure = Configure.builder()
-// .bind("inspectionOrderDetailList", new HackLoopTableRenderPolicy())
-// .build();
-// XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
-// new HashMap<String, Object>() {{
-// put("inspectionOrder", inspectionOrderExportDto);
-// put("inspectionOrderDetailList", list);
-// }});
-//
-// // 澶勭悊鎹㈣闂
-// XWPFDocumentUtils.updateMergeByDocument(template.getXWPFDocument());
-// try {
-// response.setContentType("application/msword");
-// String fileName = URLEncoder.encode(
-// inspectionOrderExportDto.getSample(), "UTF-8");
-// response.setHeader("Content-disposition",
-// "attachment;filename=" + fileName + ".docx");
-// OutputStream os = response.getOutputStream();
-// template.write(os);
-// os.flush();
-// os.close();
-// } catch (Exception e) {
-// e.printStackTrace();
-// throw new RuntimeException("瀵煎嚭澶辫触");
-// }
- }
-
- private InspectionOrderExportDto extracted(ProcessOrder processOrder) {
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�");
- InspectionOrderExportDto inspectionOrderExportDto = new InspectionOrderExportDto();
- ProcessOrderDto processOrderDto = getProcessOrder(processOrder.getId());
- BeanUtils.copyProperties(processOrderDto, inspectionOrderExportDto);
- if (processOrderDto.getCreateTime() != null) {
- inspectionOrderExportDto.setCommissionDateString(processOrderDto.getCreateTime().format(formatter));
- }
- if (processOrder.getComprehensiveTime() != null) {
- inspectionOrderExportDto.setReceiptDataString(processOrder.getComprehensiveTime().format(formatter));
- }
- if (processOrder.getIssueTime() != null) {
- inspectionOrderExportDto.setSampleDataString(processOrder.getIssueTime().format(formatter));
- }
- if (processOrderDto.getAppointed() != null) {
- inspectionOrderExportDto.setAppointedString(processOrderDto.getAppointed().format(formatter));
- }
-
- inspectionOrderExportDto.setIsLeave1(processOrderDto.getIsLeave() != null && processOrderDto.getIsLeave() == 1 ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setIsLeave2(processOrderDto.getIsLeave() != null && processOrderDto.getIsLeave() == 0 ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setSend0(processOrderDto.getSend() != null && processOrderDto.getSend() == 1 ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setSend1(processOrderDto.getSend() != null && processOrderDto.getSend() == 0 ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setProcessing0(processOrderDto.getProcessing() != null && processOrderDto.getProcessing() == 0 ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setProcessing1(processOrderDto.getProcessing() != null && processOrderDto.getProcessing() == 1 ? "鈽�" : "鈻�");
- if (ObjectUtils.isNotEmpty(processOrder.getRule())) {
- inspectionOrderExportDto.setCriterionRule0(processOrder.getRule().equals("涓嶈�冭檻涓嶇‘瀹氬害") ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setCriterionRule1(processOrder.getRule().contains("-") ? "鈽�" : "鈻�");
- inspectionOrderExportDto.setCriterionRuleRemark(processOrder.getRule().contains("-") ? processOrder.getRule().split("-")[1] : "");
- }
- return inspectionOrderExportDto;
- }
-}
diff --git a/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml b/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml
deleted file mode 100644
index 9e89315..0000000
--- a/cnas-process/src/main/resources/mapper/ProcessOrderMapper.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?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.ruoyi.process.mapper.ProcessOrderMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.ProcessOrder">
- <id column="id" property="id"/>
- <result column="ins_order_id" property="insOrderId"/>
- <result column="rule" property="rule"/>
- <result column="comprehensive_user" property="comprehensiveUser"/>
- <result column="comprehensive_time" property="comprehensiveTime"/>
- <result column="issue_user" property="issueUser"/>
- <result column="issue_time" property="issueTime"/>
- </resultMap>
-
- <resultMap id="ProcessOrderDto" type="com.ruoyi.process.dto.ProcessOrderDto">
- <id column="id" property="id"/>
- <result column="entrust_code" property="entrustCode"/>
- <result column="sample" property="sample"/>
- <result column="create_time" property="createTime"/>
- <result column="sampleType" property="sampleType"/>
- <result column="company" property="company"/>
- <result column="production" property="production"/>
- <result column="productionEn" property="productionEn"/>
- <result column="prepare_user" property="prepareUser"/>
- <result column="sample_num" property="sampleNum"/>
- <result column="ins_state" property="insState"/>
- <result column="is_leave" property="isLeave"/>
- <result column="processing" property="processing"/>
- <result column="phones" property="phone"/>
- <result column="appointed" property="appointed"/>
- <result column="send" property="send"/>
- <result column="rule" property="rule"/>
- <result column="comprehensive_user" property="comprehensiveUser"/>
- <result column="comprehensiveUserName" property="comprehensiveUserName"/>
- <result column="comprehensiveUserUrl" property="comprehensiveUserUrl"/>
- <result column="comprehensive_time" property="comprehensiveTime"/>
- <result column="issue_user" property="issueUser"/>
- <result column="issueUserName" property="issueUserName"/>
- <result column="issueUserUrl" property="issueUserUrl"/>
- <result column="issue_time" property="issueTime"/>
- <collection property="sampleItems" resultMap="SampleItemDto"/>
- </resultMap>
- <resultMap id="SampleItemDto" type="com.ruoyi.process.dto.SampleItemDto">
- <result column="code" property="code"/>
- <result column="model" property="model"/>
- <result column="product" property="product"/>
- <result column="standardMethodList" property="standardMethodList"/>
- <result column="remark" property="remark"/>
- </resultMap>
-
- <select id="pageProcessOrder" resultMap="ProcessOrderDto">
- select * from
- (
- select cpo.*,
- u1.signature_url comprehensiveUserUrl,
- u2.signature_url issueUserUrl,
- u3.phone phones,
- ioo.*
- from cnas_process_order cpo
- left join user u1 on comprehensive_user = u1.id
- left join user u2 on issue_user = u2.id
- left join
- (SELECT distinct
- io.id AS iod,
- io.entrust_code,
- io.sample,
- io.create_time,
- fst.model AS sampleType,
- io.company,
- io.production,
- io.prepare_user,
- sc.sample_num,
- io.ins_state,
- io.is_leave,
- io.processing,
- appointed,
- send
- FROM cnas_process_order cpo
- LEFT JOIN ins_order io ON cpo.ins_order_id = io.id
- LEFT JOIN (
- SELECT ins_order_id, COUNT(*) AS sample_num
- FROM ins_sample is2
- WHERE id in ( SELECT is3.id
- FROM ins_sample is3 JOIN ins_product ip ON is3.id = ip.ins_sample_id where ip.id is not null)
- GROUP BY ins_order_id
- ) sc ON io.id = sc.ins_order_id
- LEFT JOIN (
- SELECT isa.ins_order_id, isa.model
- FROM ins_sample isa
- JOIN ins_product ip ON isa.id = ip.ins_sample_id
- WHERE ip.id IS NOT NULL
- AND ip.state = 1
- AND isa.id = (
- SELECT MIN(is2.id)
- FROM ins_sample is2
- JOIN ins_product ip2 ON is2.id = ip2.ins_sample_id
- WHERE ip2.id IS NOT NULL
- AND ip2.state = 1
- AND isa.ins_order_id = is2.ins_order_id
- )
- ) fst ON io.id = fst.ins_order_id) ioo
- on cpo.ins_order_id = ioo.iod
- left join user u3 on prepare_user = u3.name
- left join (select io2.id,
- is2.sample_code,
- GROUP_CONCAT(DISTINCT ip.inspection_item SEPARATOR ' ') AS product,
- sm.code standardMethodList,
- is2.remark
- from ins_order io2
- left join ins_sample is2 on io2.id = is2.ins_order_id
- left join standard_method sm on standard_method_list_id = sm.id
- left join ins_product ip on is2.id = ip.ins_sample_id
- where ip.id is not null) A on A.id = cpo.ins_order_id
- ) B
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getProcessOrder" resultMap="ProcessOrderDto">
- select cpo.*,
- u1.name comprehensiveUserName,
- u1.signature_url comprehensiveUserUrl,
- u2.name issueUserName,
- u2.signature_url issueUserUrl,
- u3.phone phones,
- u3.signature_url prepareUserUrl,
- ioo.*,
- A.*
- from cnas_process_order cpo
- left join user u1 on comprehensive_user = u1.id
- left join user u2 on issue_user = u2.id
- left join
- (SELECT distinct cpo.id,
- io.id AS iod,
- io.entrust_code,
- io.sample,
- io.create_time,
- fst.model AS sampleType,
- io.company,
- io.production,
- io.prepare_user,
- sc.sample_num,
- io.ins_state,
- io.is_leave,
- io.processing,
- appointed,
- send
- FROM cnas_process_order cpo
- LEFT JOIN ins_order io ON cpo.ins_order_id = io.id
- LEFT JOIN (
- SELECT ins_order_id, COUNT(*) AS sample_num
- FROM ins_sample is2
- WHERE id in (SELECT is3.id
- FROM ins_sample is3
- JOIN ins_product ip ON is3.id = ip.ins_sample_id
- where ip.id is not null)
- GROUP BY ins_order_id
- ) sc ON io.id = sc.ins_order_id
- LEFT JOIN (
- SELECT isa.ins_order_id, isa.model
- FROM ins_sample isa
- JOIN ins_product ip ON isa.id = ip.ins_sample_id
- WHERE ip.id IS NOT NULL
- AND ip.state = 1
- AND isa.id = (
- SELECT MIN(is2.id)
- FROM ins_sample is2
- JOIN ins_product ip2 ON is2.id = ip2.ins_sample_id
- WHERE ip2.id IS NOT NULL
- AND ip2.state = 1
- AND isa.ins_order_id = is2.ins_order_id)
- ) fst ON io.id = fst.ins_order_id) ioo on cpo.ins_order_id = ioo.iod
- left join user u3 on prepare_user = u3.name
- left join
- (select io2.id,
- is2.sample_code code,
- is2.model,
- GROUP_CONCAT(DISTINCT ip.inspection_item SEPARATOR ' ') AS product,
- sm.code standardMethodList,
- is2.remark
- from ins_order io2
- left join ins_sample is2 on io2.id = is2.ins_order_id
- left join standard_method sm on standard_method_list_id = sm.id
- left join ins_product ip on is2.id = ip.ins_sample_id
- left join cnas_process_order cpo2 on io2.id = cpo2.ins_order_id
- where ip.id is not null
- and cpo2.id = #{id}) A on A.id = cpo.ins_order_id
- where cpo.id = #{id}
- </select>
- <select id="selectInsOrder" resultType="com.ruoyi.process.pojo.InspectionOrderDetail">
- select is2.sample_code sampleNumber,
- is2.model,
- GROUP_CONCAT(DISTINCT ip.inspection_item SEPARATOR ',') AS testItem,
- sm.code testStandard,
- is2.remark
- from ins_sample is2
- left join standard_method sm on standard_method_list_id = sm.id
- left join ins_product ip on is2.id = ip.ins_sample_id
- where ip.id is not null
- and ins_order_id = #{id}
- </select>
-</mapper>
--
Gitblit v1.9.3