修改sqlserver兼容

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

@@ -80,7 +80,7 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
         Assert.isTrue(dto.getLoanDuration() >= dto.getReminderTime(), "借用时长需要大于等于提醒时长！");
         dto.setCreateTime(DateUtils.getNowDate());
         IsMaterialsType isMaterialsType = BeanUtils.toBean(dto, IsMaterialsType.class);
-        int i = isMaterialsTypeMapper.insertIsMaterialsType(isMaterialsType);
+        save(isMaterialsType);
         // 开始新增规则
         IsMaterialsRestitutionRules isMaterialsRestitutionRules = new IsMaterialsRestitutionRules();
         isMaterialsRestitutionRules.setMaterialsTypeId(isMaterialsType.getMaterialsTypeId());
@@ -91,7 +91,7 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
         isMaterialsRestitutionRules.setTimeoutAlarm(dto.getTimeoutAlarm());
         isMaterialsRestitutionRules.setDelFlag(dto.getDelFlag());
         iIsMaterialsRestitutionRulesService.insertIsMaterialsRestitutionRules(isMaterialsRestitutionRules);
-        return i;
+        return 1;
     }
 
     /**

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

@@ -217,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         j.update_by,
         j.workstation_id,
         j.machinery_id) t
-        ORDER BY j.ticket_id DESC
+        ORDER BY t.ticket_id DESC
     </select>
     <select id="getMonitorJobTicketPage" resultType="com.ktg.iscs.domain.vo.ticket.MonitorTicketPageVO">
         SELECT
@@ -268,10 +268,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where (j.create_by = #{userId} or u.user_id = #{userId}) and j.ticket_status &lt; 5
     </select>
     <select id="selectConflictTicket1" resultType="com.ktg.iscs.domain.vo.ticket.JobTicketDetailVO">
+        select t.* from (
         SELECT
-        j.*
+        j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id
         FROM
-        `is_job_ticket` j
+        is_job_ticket j
         LEFT JOIN is_job_ticket_points p ON p.ticket_id = j.ticket_id
         LEFT JOIN is_job_ticket_key k ON k.ticket_id = j.ticket_id
         WHERE
@@ -285,13 +303,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and k.ticket_type = 0
         and j.ticket_id != #{ticketId}
         GROUP BY
-        j.ticket_id
+        j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id) t
+        order by t.ticket_id desc
     </select>
     <select id="selectConflictTicket2" resultType="com.ktg.iscs.domain.vo.ticket.JobTicketDetailVO">
+        select t.* from (
         SELECT
-        j.*
+        j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id
         FROM
-        `is_job_ticket` j
+        is_job_ticket j
         LEFT JOIN is_job_ticket_points p ON p.ticket_id = j.ticket_id
         LEFT JOIN is_job_ticket_key k1 ON k1.ticket_id = j.ticket_id and k1.ticket_type = 0
         LEFT JOIN is_job_ticket_key k2 ON k2.ticket_id = j.ticket_id and k2.ticket_type = 1
@@ -308,7 +362,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and j.ticket_id != #{ticketId}
         and p.point_status = 1
         GROUP BY
-        j.ticket_id
+        j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id) t
+        order by t.ticket_id
     </select>
 
 </mapper>

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

@@ -146,9 +146,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CONCAT(
         FLOOR( DATEDIFF( SECOND, l.loan_time, l.actual_restitution_time ) / 3600 ),
         '小时 ',
-        MOD ( FLOOR( DATEDIFF( SECOND, l.loan_time, l.actual_restitution_time ) / 60 ), 60 ),
+        FLOOR( DATEDIFF( SECOND, l.loan_time, l.actual_restitution_time ) / 60 ) % 60,
         '分 ',
-        MOD ( DATEDIFF( SECOND, l.loan_time, l.actual_restitution_time ), 60 ),
+        DATEDIFF( SECOND, l.loan_time, l.actual_restitution_time ) % 60,
         '秒'
         ) ELSE null
         END AS loan_duration

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

@@ -15,5 +15,6 @@
                 and v.property_id = #{isMaterialsPropertyValue.propertyId}
             </if>
         </where>
+        order by v.record_id desc
     </select>
 </mapper>