Commit 4fd35457 authored by 刘林's avatar 刘林

fix(jg)解决大屏报错问题,解决导入设备代码为空问题

parent 8be57be9
...@@ -2943,6 +2943,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2943,6 +2943,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 注册登记 // 注册登记
IdxBizJgRegisterInfo registerInfo = new IdxBizJgRegisterInfo(); IdxBizJgRegisterInfo registerInfo = new IdxBizJgRegisterInfo();
BeanUtils.copyProperties(data, registerInfo); BeanUtils.copyProperties(data, registerInfo);
registerInfo.setEquCode("2".equals(data.getEquCodeType()) ? "" : registerInfo.getEquCode());
registerInfo.setRecord(record); registerInfo.setRecord(record);
registerInfo.setRecDate(new Date()); registerInfo.setRecDate(new Date());
registerInfo.setEquCategory(equipInfoDto.getEquCategoryCode()); registerInfo.setEquCategory(equipInfoDto.getEquCategoryCode());
......
...@@ -337,7 +337,6 @@ ...@@ -337,7 +337,6 @@
thur.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) thur.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
AND thur.audit_pass_date &lt; #{time} AND thur.audit_pass_date &lt; #{time}
AND ibjri."EQU_LIST" = '3000' AND ibjri."EQU_LIST" = '3000'
AND ibjri.is_delete = 0
AND thur.is_delete = 0 AND thur.is_delete = 0
</select> </select>
<select id="constructionNoticeCount" resultType="java.lang.Long"> <select id="constructionNoticeCount" resultType="java.lang.Long">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment