han\hanst 9 hours ago
parent
commit
ddb6b2ff1d
  1. 8
      src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml
  2. 10
      src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml
  3. BIN
      src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx

8
src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml

@ -208,7 +208,7 @@
<insert id="insertProjectInfoFromOneKey"> <insert id="insertProjectInfoFromOneKey">
<selectKey keyProperty="projectId" resultType="int" order="BEFORE"> <selectKey keyProperty="projectId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 100000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_project_info_tracking INSERT INTO plm_project_info_tracking
@ -229,7 +229,7 @@
<insert id="insertProjectPartFromOneKey"> <insert id="insertProjectPartFromOneKey">
<selectKey keyProperty="projectPartId" resultType="int" order="BEFORE"> <selectKey keyProperty="projectPartId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 100000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_project_part_tracking INSERT INTO plm_project_part_tracking
@ -248,7 +248,7 @@
<insert id="insertProofTracking"> <insert id="insertProofTracking">
<selectKey keyProperty="trackingId" resultType="int" order="BEFORE"> <selectKey keyProperty="trackingId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 100000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_proofing_information_tracking INSERT INTO plm_proofing_information_tracking
@ -653,7 +653,7 @@
<insert id="insertTrackingFromPart"> <insert id="insertTrackingFromPart">
<selectKey keyProperty="trackingId" resultType="int" order="BEFORE"> <selectKey keyProperty="trackingId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 100000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_proofing_information_tracking INSERT INTO plm_proofing_information_tracking

10
src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml

@ -78,7 +78,7 @@
<insert id="saveProjectInfoTracking"> <insert id="saveProjectInfoTracking">
<selectKey keyProperty="projectId" resultType="int" order="BEFORE"> <selectKey keyProperty="projectId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 10000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_project_info_tracking INSERT INTO plm_project_info_tracking
@ -255,7 +255,7 @@
<insert id="saveProjectPartTracking"> <insert id="saveProjectPartTracking">
<selectKey keyProperty="projectPartId" resultType="int" order="BEFORE"> <selectKey keyProperty="projectPartId" resultType="int" order="BEFORE">
SELECT ISNULL(MAX(id), 10000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK)
</selectKey> </selectKey>
INSERT INTO plm_project_part_tracking INSERT INTO plm_project_part_tracking
@ -411,7 +411,7 @@
</select> </select>
<select id="selectNextProjectInfoTrackingId" resultType="java.lang.Integer"> <select id="selectNextProjectInfoTrackingId" resultType="java.lang.Integer">
SELECT ISNULL(MAX(id), 10000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK)
</select> </select>
@ -528,7 +528,7 @@
</select> </select>
<select id="selectNextProjectPartTrackingId" resultType="java.lang.Integer"> <select id="selectNextProjectPartTrackingId" resultType="java.lang.Integer">
SELECT ISNULL(MAX(id), 10000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK)
</select> </select>
@ -655,7 +655,7 @@
</select> </select>
<select id="selectNextProofTrackingId" resultType="java.lang.Integer"> <select id="selectNextProofTrackingId" resultType="java.lang.Integer">
SELECT ISNULL(MAX(id), 10000) + 1
SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1
FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK) FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK)
</select> </select>

BIN
src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx

Loading…
Cancel
Save