对接修改

ktg-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="remark"         column="remark"            />
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
-	
+
 	<resultMap type="GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
@@ -52,11 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
-	
+
 	<sql id="selectGenTableVo">
         select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
-    
+
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
+		order by table_id desc
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -94,22 +95,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
         order by create_time desc
 	</select>
-	
+
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
 		and table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}
-        </foreach> 
+        </foreach>
 	</select>
-	
+
 	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
 		and table_name = #{tableName}
 	</select>
-	
+
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
 	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -117,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_id = #{tableId} order by c.sort
 	</select>
-	
+
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
 	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -125,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_name = #{tableName} order by c.sort
 	</select>
-	
+
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
 	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -133,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		order by c.sort
 	</select>
-	
+
 	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
 			<if test="tableName != null">table_name,</if>
@@ -167,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sysdate()
          )
     </insert>
-    
+
     <update id="updateGenTable" parameterType="GenTable">
         update gen_table
         <set>
@@ -191,12 +192,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where table_id = #{tableId}
     </update>
-    
+
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
+        delete from gen_table where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
     </delete>
 
-</mapper>
+</mapper>

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsJobTicketController.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -9,7 +8,9 @@ import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsJobTicket;
 import com.ktg.iscs.domain.dto.ticket.AddJobTicketDTO;
+import com.ktg.iscs.domain.dto.ticket.PageTicketDTO;
 import com.ktg.iscs.domain.vo.ticket.JobTicketDetailVO;
+import com.ktg.iscs.domain.vo.ticket.PageTicketVO;
 import com.ktg.iscs.service.IIsJobTicketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,11 +47,9 @@ public class IsJobTicketController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:ticket:list')")
     @GetMapping("/getIsJobTicketPage")
-    public CommonResult<Page<IsJobTicket>> getIsJobTicketPage(Page<IsJobTicket> page, IsJobTicket isJobTicket)
+    public CommonResult<Page<PageTicketVO>> getIsJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto)
     {
-        Page<IsJobTicket> result = isJobTicketService.page(page, Wrappers.<IsJobTicket>lambdaQuery()
-                .orderByDesc(IsJobTicket::getTicketId));
-        return CommonResult.success(result);
+        return CommonResult.success(isJobTicketService.getIsJobTicketPage(page, dto));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsHardware.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -23,6 +24,7 @@ public class IsHardware extends BaseBean {
     /**
      * 主键id
      */
+    @TableId
     @ApiModelProperty(value = "主键id")
     private Long id;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsHardwareType.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,6 +21,7 @@ public class IsHardwareType extends BaseBean {
     /**
      * 主键id
      */
+    @TableId
     @ApiModelProperty(value = "主键id")
     private Long id;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsIsolationPoint.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsIsolationPoint extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 隔离点ID */
+    @TableId
     @ApiModelProperty(value = "隔离点ID")
     private Long pointId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicket.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -22,6 +23,7 @@ public class IsJobTicket extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 作业票ID */
+    @TableId
     @ApiModelProperty(value = "作业票ID")
     private Long ticketId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketPoints.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsJobTicketPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
+    @TableId
     @ApiModelProperty(value = "记录ID")
     private Long recordId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketUser.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsJobTicketUser extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
+    @TableId
     @ApiModelProperty(value = "记录ID")
     private Long recordId;
 
@@ -38,7 +40,7 @@ public class IsJobTicketUser extends BaseBean
     private String userName;
 
     /** 用户类型 */
-    @ApiModelProperty(value = "用户类型")
+    @ApiModelProperty(value = "用户类型(0上锁人 1公锁人)")
     @Excel(name = "用户类型")
     private String userType;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsSop.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsSop extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** SOP ID */
+    @TableId
     @ApiModelProperty(value = "SOP ID")
     private Long sopId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsSopPoints.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsSopPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
+    @TableId
     @ApiModelProperty(value = "记录ID")
     private Long recordId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsWorkarea.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,7 @@ public class IsWorkarea extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 区域ID */
+    @TableId
     @ApiModelProperty(value = "区域ID")
     private Long workareaId;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/TestIscs.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,6 +20,7 @@ public class TestIscs extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId
     @Schema(description = "主键id")
     private Long id;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/PageTicketDTO.java

@@ -0,0 +1,42 @@
+package com.ktg.iscs.domain.dto.ticket;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 作业票对象 is_job_ticket
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@Data
+public class PageTicketDTO
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "作业票编号")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "作业票名称")
+    private String ticketName;
+
+    @ApiModelProperty(value = "作业票状态")
+    private String ticketStatus;
+
+    @ApiModelProperty(value = "所属车间ID")
+    private Long workshopId;
+
+    @ApiModelProperty(value = "所属区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "作业票类型")
+    private String ticketType;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/sop/SopPageVO.java

@@ -50,4 +50,7 @@ public class SopPageVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "隔离点数量")
+    private Integer pointCount;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticket/JobTicketDetailVO.java

@@ -35,12 +35,21 @@ public class JobTicketDetailVO extends BaseBean
     @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
+    @ApiModelProperty(value = "所属车间Name")
+    private String workshopName;
+
     @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
+    @ApiModelProperty(value = "所属区域Name")
+    private String workareaName;
+
     @ApiModelProperty(value = "所属SOPID")
     private Long sopId;
 
+    @ApiModelProperty(value = "所属SOPNAME")
+    private String sopName;
+
     @ApiModelProperty(value = "作业票类型")
     private String ticketType;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticket/PageTicketVO.java

@@ -0,0 +1,64 @@
+package com.ktg.iscs.domain.vo.ticket;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 作业票对象 is_job_ticket
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PageTicketVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "作业票ID")
+    private Long ticketId;
+
+    @ApiModelProperty(value = "作业票编号")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "作业票名称")
+    private String ticketName;
+
+    @ApiModelProperty(value = "所属车间ID")
+    private Long workshopId;
+
+    @ApiModelProperty(value = "所属区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "所属SOPID")
+    private Long sopId;
+
+    @ApiModelProperty(value = "作业票类型")
+    private String ticketType;
+
+    @ApiModelProperty(value = "作业票详情")
+    private String ticketContent;
+
+    @ApiModelProperty(value = "作业票状态")
+    private String ticketStatus;
+
+    @ApiModelProperty(value = "作业票开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ticketStartTime;
+
+    @ApiModelProperty(value = "作业票结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ticketEndTime;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "隔离点数量")
+    private Integer pointCount;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsJobTicketMapper.java

@@ -1,8 +1,12 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsJobTicket;
+import com.ktg.iscs.domain.dto.ticket.PageTicketDTO;
+import com.ktg.iscs.domain.vo.ticket.PageTicketVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +66,6 @@ public interface IsJobTicketMapper extends BaseMapperX<IsJobTicket>
      * @return 结果
      */
     int deleteIsJobTicketByTicketIds(Long[] ticketIds);
+
+    Page<PageTicketVO> getIsJobTicketPage(Page<IsJobTicket> page, @Param(value = "dto") PageTicketDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsJobTicketService.java

@@ -1,9 +1,12 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsJobTicket;
 import com.ktg.iscs.domain.dto.ticket.AddJobTicketDTO;
+import com.ktg.iscs.domain.dto.ticket.PageTicketDTO;
 import com.ktg.iscs.domain.vo.ticket.JobTicketDetailVO;
+import com.ktg.iscs.domain.vo.ticket.PageTicketVO;
 
 import java.util.List;
 
@@ -62,4 +65,12 @@ public interface IIsJobTicketService extends IService<IsJobTicket>
      * @return 结果
      */
     int deleteIsJobTicketByTicketId(Long ticketId);
+
+    /**
+     * 作业票分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<PageTicketVO> getIsJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -2,6 +2,7 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
@@ -12,8 +13,10 @@ import com.ktg.iscs.domain.IsJobTicketPoints;
 import com.ktg.iscs.domain.IsJobTicketUser;
 import com.ktg.iscs.domain.dto.ticket.AddJobTicketDTO;
 import com.ktg.iscs.domain.dto.ticket.AddTicketUserDTO;
+import com.ktg.iscs.domain.dto.ticket.PageTicketDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import com.ktg.iscs.domain.vo.ticket.JobTicketDetailVO;
+import com.ktg.iscs.domain.vo.ticket.PageTicketVO;
 import com.ktg.iscs.mapper.IsJobTicketMapper;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import com.ktg.iscs.service.IIsJobTicketPointsService;
@@ -223,4 +226,9 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
     {
         return isJobTicketMapper.deleteIsJobTicketByTicketId(ticketId);
     }
+
+    @Override
+    public Page<PageTicketVO> getIsJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto) {
+        return isJobTicketMapper.getIsJobTicketPage(page, dto);
+    }
 }

ktg-iscs/src/main/resources/mapper/IsJobTicketMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsJobTicketMapper">
-    
+
     <resultMap type="IsJobTicket" id="IsJobTicketResult">
         <result property="ticketId"    column="ticket_id"    />
         <result property="ticketCode"    column="ticket_code"    />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsJobTicketList" parameterType="IsJobTicket" resultMap="IsJobTicketResult">
         <include refid="selectIsJobTicketVo"/>
-        <where>  
+        <where>
             <if test="ticketCode != null  and ticketCode != ''"> and ticket_code = #{ticketCode}</if>
             <if test="ticketName != null  and ticketName != ''"> and ticket_name like concat('%', #{ticketName}, '%')</if>
             <if test="workshopId != null "> and workshop_id = #{workshopId}</if>
@@ -42,12 +42,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ticketEndTime != null "> and ticket_end_time = #{ticketEndTime}</if>
         </where>
     </select>
-    
+
     <select id="selectIsJobTicketByTicketId" parameterType="Long" resultMap="IsJobTicketResult">
-        <include refid="selectIsJobTicketVo"/>
-        where ticket_id = #{ticketId}
+        <!--<include refid="selectIsJobTicketVo"/>-->
+        SELECT
+        t.*,
+        ws.workshop_name,
+        wa.workarea_name,
+        s.sop_name
+        FROM
+        is_job_ticket t
+        LEFT JOIN md_workshop ws ON ws.workshop_id = t.workshop_id
+        LEFT JOIN is_workarea wa ON wa.workarea_id = t.workarea_id
+        LEFT JOIN is_sop s ON s.sop_id = t.sop_id
+        WHERE ticket_id = #{ticketId}
     </select>
-        
+
     <insert id="insertIsJobTicket" parameterType="IsJobTicket" useGeneratedKeys="true" keyProperty="ticketId">
         insert into is_job_ticket
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -113,9 +123,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsJobTicketByTicketIds" parameterType="String">
-        delete from is_job_ticket where ticket_id in 
+        delete from is_job_ticket where ticket_id in
         <foreach item="ticketId" collection="array" open="(" separator="," close=")">
             #{ticketId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsJobTicketPage" resultType="com.ktg.iscs.domain.vo.ticket.PageTicketVO">
+        SELECT
+        j.*,
+        ws.workshop_name,
+        wa.workarea_name,
+        COUNT( p.record_id ) AS pointCount
+        FROM
+        is_job_ticket j
+        LEFT JOIN md_workshop ws ON ws.workshop_id = j.workshop_id
+        LEFT JOIN is_workarea wa ON wa.workarea_id = j.workarea_id
+        LEFT JOIN is_job_ticket_points p ON p.ticket_id = j.ticket_id
+        <where>
+            <if test="dto.ticketCode != null and dto.ticketCode.trim != ''">
+                and j.ticket_code like concat('%',#{dto.ticketCode},'%')
+            </if>
+            <if test="dto.ticketName != null and dto.ticketName.trim != ''">
+                and j.ticket_name like concat('%',#{dto.ticketName},'%')
+            </if>
+            <if test="dto.ticketStatus != null and dto.ticketStatus.trim != ''">
+                and j.ticket_status = #{dto.ticketStatus}
+            </if>
+            <if test="dto.workshopId != null">
+                and j.workshop_id = #{dto.workshopId}
+            </if>
+            <if test="dto.workareaId != null">
+                and j.workarea_id = #{dto.workareaId}
+            </if>
+            <if test="dto.ticketType != null and dto.ticketType.trim != ''">
+                and j.ticket_type = #{dto.ticketType}
+            </if>
+            <if test="dto.startTime != null and dto.startTime.trim != ''">
+                and j.create_time &gt;= #{dto.startTime}
+            </if>
+            <if test="dto.endTime != null and dto.endTime.trim != ''">
+                and j.create_time &lt;= #{dto.endTime}
+            </if>
+        </where>
+        GROUP BY j.ticket_id
+        ORDER BY j.ticket_id DESC
+    </select>
+</mapper>

ktg-iscs/src/main/resources/mapper/IsSopMapper.xml

@@ -108,11 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             s.*,
             ws.workshop_name,
-            wa.workarea_name
+            wa.workarea_name,
+            COUNT( p.record_id ) AS pointCount
         FROM
             is_sop s
             LEFT JOIN md_workshop ws ON ws.workshop_id = s.workshop_id
             LEFT JOIN is_workarea wa ON wa.workarea_id = s.workarea_id
+            LEFT JOIN is_sop_points p ON p.sop_id = s.sop_id
         <where>
             <if test="dto.sopCode != null and dto.sopCode.trim != ''">
                 and s.sop_code like concat('%',#{dto.sopCode},'%')
@@ -139,7 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and s.create_time &lt;= #{dto.endTime}
             </if>
         </where>
-        order by s.sop_id desc
+        GROUP BY s.sop_id
+        ORDER BY s.sop_id DESC
     </select>
 
 </mapper>