Sfoglia il codice sorgente

fix 数据确认 和报告生成 图片

32197351@qq.com 2 anni fa
parent
commit
a8213c26f3

+ 1 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -96,6 +96,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
         QueryWrapper<ItdmGongdanDetail> queryWrapper = new QueryWrapper<ItdmGongdanDetail>();
         queryWrapper.eq("wo_id", woId);
         queryWrapper.eq("shiji_work_date", riqi);
+        queryWrapper.apply("limit 1");
 
         return itdmGongdanDetailMapper.selectOne(queryWrapper);
     }

+ 1 - 1
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/xml/ItdmTestPlanMapper.xml

@@ -58,7 +58,7 @@
     </select>
     <select id="getShujuByShiyanid" resultType="java.util.HashMap">
 
-        select c.shiyan_wendu,c.shiyan_shidu,c.shiyan_time
+        select c.shiyan_wendu,c.shiyan_shidu,c.shiyan_time,c.shiyan_date_time
         from itdm_gongdan_master as b
 
         inner join itdm_gongdan_shuju c on b.id = c.wo_id