增加查询条件

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml

@@ -182,6 +182,9 @@
         <if test="dsPart.formingThickness != null">
             AND p.FORMING_THICKNESS = #{dsPart.formingThickness}
         </if>
+        <if test="dsPart.productType != null">
+            AND p.PRODUCT_TYPE = #{dsPart.productType}
+        </if>
         <if test="dsPart.startDate != null and dsPart.endDate != null">
             AND p.NEXT_DUE BETWEEN TO_DATE(#{dsPart.startDate}, 'YYYY-MM-DD')
             AND TO_DATE(#{dsPart.endDate}, 'YYYY-MM-DD') + 1 - 1/86400

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -2557,10 +2557,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 					new ArrayList<>());
 
 			// 设置尺寸量具列表
+			// trialNo 有可能为null 所以不进行排序
 			List<DsProcessMeasuringToolEntity> tools = measuringToolMap.get(processId);
 			processNode.setMeasuringToolList(tools != null ?
 					tools.stream()
-							.sorted(Comparator.comparing(DsProcessMeasuringToolEntity::getTrialNo))
 							.map(JSONObject::from).collect(Collectors.toList()) :
 					new ArrayList<>());