1

src/main/java/com/heai/modules/pms/data/QcPartAttributeData.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.heai.common.utils.QueryPage;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class QcPartAttributeData extends QueryPage {
@@ -129,11 +130,11 @@ public class QcPartAttributeData extends QueryPage {
     // 最小值
     private String minValue;
     // 首次IPQC巡检时间
-    private String firstIPQCPatrolTime;
+    private BigDecimal firstIPQCPatrolTime;
     // 下次IPQC巡检时间
-    private String lastIPQCPatrolTime;
+    private BigDecimal lastIPQCPatrolTime;
     // 累计巡检时间
-    private String cycleIPQCPatrolTime;
+    private BigDecimal cycleIPQCPatrolTime;
 
     public String getDefaultValue() {
         return defaultValue;
@@ -167,27 +168,27 @@ public class QcPartAttributeData extends QueryPage {
         this.minValue = minValue;
     }
 
-    public String getFirstIPQCPatrolTime() {
+    public BigDecimal getFirstIPQCPatrolTime() {
         return firstIPQCPatrolTime;
     }
 
-    public void setFirstIPQCPatrolTime(String firstIPQCPatrolTime) {
+    public void setFirstIPQCPatrolTime(BigDecimal firstIPQCPatrolTime) {
         this.firstIPQCPatrolTime = firstIPQCPatrolTime;
     }
 
-    public String getLastIPQCPatrolTime() {
+    public BigDecimal getLastIPQCPatrolTime() {
         return lastIPQCPatrolTime;
     }
 
-    public void setLastIPQCPatrolTime(String lastIPQCPatrolTime) {
+    public void setLastIPQCPatrolTime(BigDecimal lastIPQCPatrolTime) {
         this.lastIPQCPatrolTime = lastIPQCPatrolTime;
     }
 
-    public String getCycleIPQCPatrolTime() {
+    public BigDecimal getCycleIPQCPatrolTime() {
         return cycleIPQCPatrolTime;
     }
 
-    public void setCycleIPQCPatrolTime(String cycleIPQCPatrolTime) {
+    public void setCycleIPQCPatrolTime(BigDecimal cycleIPQCPatrolTime) {
         this.cycleIPQCPatrolTime = cycleIPQCPatrolTime;
     }
 

src/main/resources/mapper/pms/QcMapper.xml

@@ -25,7 +25,7 @@
         LEFT JOIN qc_inspection_type as qit on qm.site = qit.site and qm.inspection_type_no = qit.inspection_type_no
         <where>
             <if test="query.site != null and query.site != ''">
-                AND qm.site = #{query.methodNo}
+                AND qm.site = #{query.site}
             </if>
             <if test="query.methodNo != null and query.methodNo != ''">
                 AND qm.method_no LIKE '%' + #{query.methodNo} +'%'
@@ -4260,7 +4260,10 @@
     <select id="getQcIPQCInspection" resultType="com.heai.modules.pms.data.QcFAIRecordData">
         select *
         from qc_ipqc_record
-        where site = #{site} and seq_no = #{seqNo} and order_no = #{orderNo} and inspection_type_no = #{inspectionTypeNo}
+        where site = #{site} and seq_no = #{seqNo} and order_no = #{orderNo}
+        <if test=" inspectionTypeNo != null and inspectionTypeNo != ''">
+            and inspection_type_no = #{inspectionTypeNo}
+        </if>
     </select>
     <update id="updateEquipmentFolderLocation">
         UPDATE Equipment_folder_location