Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -856,7 +856,7 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                 if(eq != null){
                     orderItem.setOrderId(confirmOrderId);
                     orderItem.setEquipId(eq.getId());
-                    orderItem.setEquipCode(equipPipeDO.getProjectNo());
+                    orderItem.setEquipCode(eq.getProjectNo());
                     //orderItem.setEquipCode("");
                     orderItem.setPlanDate(planDate);
                     //orderItem.setUseRegisterNo(eq.getUseRegisterNo());

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemQueryMapper.xml

@@ -25,7 +25,19 @@
 
     <select id="selectTaskOrderIssuePrintPage" resultMap="TaskOrderRespVOResultMap">
         SELECT
-        t1.*,
+        t1.id,
+        t1.ORDER_ID,
+        t1.EQUIP_ID,
+        t1.MAIN_CHECKER,
+        t1.TASK_STATUS,
+        t1.FEE,t1.REPORT_NO,
+        t1.PIPE_TYPE,
+        t1.END_CHECK_DATE,
+        t1.IS_ISSUE_REPORT,
+        t1.USE_LOGO,
+        t1.USE_LOGO_TIME,
+        t1.ISSUE_URL,
+        t1.IS_PUSH_PLATFORM,
         t2.payment_status,
         t3.id AS report_id,
         t3.report_no,