对接修改调整

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

@@ -112,6 +112,6 @@ public class IsJobTicketController extends BaseController
 	@PostMapping("/deleteIsJobTicketByTicketIds")
     public CommonResult<Boolean> deleteIsJobTicketByTicketIds(String ticketIds)
     {
-        return CommonResult.success(isJobTicketService.deleteIsJobTicketByTicketIds(ticketIds) != 0);
+        return CommonResult.success(isJobTicketService.deleteIsJobTicketByTicketIds(ticketIds));
     }
 }

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

@@ -105,6 +105,6 @@ public class IsSopController extends BaseController {
     @Log(title = "SOP信息", businessType = BusinessType.DELETE)
     @PostMapping("/deleteIsSopBySopIds")
     public CommonResult<Boolean> deleteIsSopBySopIds(String sopIds) {
-        return CommonResult.success(isSopService.deleteIsSopBySopIds(sopIds) != 0);
+        return CommonResult.success(isSopService.deleteIsSopBySopIds(sopIds));
     }
 }

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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
@@ -24,7 +25,7 @@ public class IsHardware extends BaseBean {
     /**
      * 主键id
      */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -21,7 +22,7 @@ public class IsHardwareType extends BaseBean {
     /**
      * 主键id
      */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsIsolationPoint extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 隔离点ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
@@ -23,7 +24,7 @@ public class IsJobTicket extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 作业票ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsJobTicketPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsJobTicketUser extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "记录ID")
     private Long recordId;
 

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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsSop extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** SOP ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsSopPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
@@ -20,7 +21,7 @@ public class IsWorkarea extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 区域ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @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.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,7 +21,7 @@ public class TestIscs extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键id")
     private Long id;
 

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

@@ -32,9 +32,15 @@ public class PageTicketVO 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;
 

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

@@ -56,7 +56,7 @@ public interface IIsJobTicketService extends IService<IsJobTicket>
      * @param ticketIds 需要删除的作业票主键集合
      * @return 结果
      */
-    int deleteIsJobTicketByTicketIds(String ticketIds);
+    Boolean deleteIsJobTicketByTicketIds(String ticketIds);
 
     /**
      * 删除作业票信息

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

@@ -56,7 +56,7 @@ public interface IIsSopService extends IService<IsSop>
      * @param sopIds 需要删除的SOP信息主键集合
      * @return 结果
      */
-    int deleteIsSopBySopIds(String sopIds);
+    Boolean deleteIsSopBySopIds(String sopIds);
 
     /**
      * 删除SOP信息信息

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.bean.BeanUtils;
-import com.ktg.iscs.domain.IsIsolationPoint;
-import com.ktg.iscs.domain.IsJobTicket;
-import com.ktg.iscs.domain.IsJobTicketPoints;
-import com.ktg.iscs.domain.IsJobTicketUser;
+import com.ktg.iscs.domain.*;
 import com.ktg.iscs.domain.dto.ticket.AddJobTicketDTO;
 import com.ktg.iscs.domain.dto.ticket.AddTicketUserDTO;
 import com.ktg.iscs.domain.dto.ticket.PageTicketDTO;
@@ -28,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -208,11 +206,22 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
      * @return 结果
      */
     @Override
-    public int deleteIsJobTicketByTicketIds(String ticketIds)
+    public Boolean deleteIsJobTicketByTicketIds(String ticketIds)
     {
+        // 1.断言判断
         Assert.notBlank(ticketIds, "请选择需要删除的数据!");
+        // 2.删除主数据
         Long[] longIds = Convert.toLongArray(ticketIds);
-        return isJobTicketMapper.deleteIsJobTicketByTicketIds(longIds);
+        isJobTicketMapper.deleteIsJobTicketByTicketIds(longIds);
+        // 3.同时删除is_job_ticket_points
+        List<IsJobTicketPoints> isJobTicketPointsList = iIsJobTicketPointsService.list(Wrappers.<IsJobTicketPoints>lambdaQuery()
+                .in(IsJobTicketPoints::getPointId, longIds));
+        Set<Long> recordIds = isJobTicketPointsList.stream().map(IsJobTicketPoints::getRecordId).collect(Collectors.toSet());
+        if (!recordIds.isEmpty()) {
+            String rids = StringUtils.join(recordIds.toArray(), ",");
+            iIsJobTicketPointsService.deleteIsJobTicketPointsByRecordIds(rids);
+        }
+        return true;
     }
 
     /**

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -161,11 +162,23 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
      * @param sopIds 需要删除的SOP信息主键
      * @return 结果
      */
+    @Transactional
     @Override
-    public int deleteIsSopBySopIds(String sopIds) {
+    public Boolean deleteIsSopBySopIds(String sopIds) {
+        // 1.断言判断
         Assert.notBlank(sopIds, "请选择需要删除的数据!");
+        // 2.删除主数据
         Long[] longIds = Convert.toLongArray(sopIds);
-        return isSopMapper.deleteIsSopBySopIds(longIds);
+        isSopMapper.deleteIsSopBySopIds(longIds);
+        // 3.同时删除is_sop_points关联数据
+        List<IsSopPoints> isSopPointsList = iIsSopPointsService.list(Wrappers.<IsSopPoints>lambdaQuery()
+                .in(IsSopPoints::getSopId, longIds));
+        Set<Long> recordIds = isSopPointsList.stream().map(IsSopPoints::getRecordId).collect(Collectors.toSet());
+        if (!recordIds.isEmpty()) {
+            String rids = StringUtils.join(recordIds.toArray(), ",");
+            iIsSopPointsService.deleteIsSopPointsByRecordIds(rids);
+        }
+        return true;
     }
 
     /**

ktg-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
-	
+
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
+        select dict_id, dict_name, dict_type, status, create_by, create_time, remark
 		from sys_dict_type
     </sql>
 
@@ -39,36 +39,37 @@ 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 dict_id desc
 	</select>
-	
+
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 	</select>
-	
+
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_id = #{dictId}
 	</select>
-	
+
 	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType}
 	</select>
-	
+
 	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType} limit 1
 	</select>
-	
+
 	<delete id="deleteDictTypeById" parameterType="Long">
  		delete from sys_dict_type where dict_id = #{dictId}
  	</delete>
- 	
+
  	<delete id="deleteDictTypeByIds" parameterType="Long">
  		delete from sys_dict_type where dict_id in
  		<foreach collection="array" item="dictId" open="(" separator="," close=")">
  			#{dictId}
-        </foreach> 
+        </foreach>
  	</delete>
 
  	<update id="updateDictType" parameterType="SysDictType">
@@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where dict_id = #{dictId}
 	</update>
- 	
+
  	<insert id="insertDictType" parameterType="SysDictType">
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
@@ -101,5 +102,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-</mapper> 
+
+</mapper>