Commit fc8399aa authored by 韩桐桐's avatar 韩桐桐

fix(jg):使用登记导出和查询列表写法修改

parent fa0f84fe
......@@ -193,7 +193,7 @@
<if test="contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
and (tjmc.instance_id <![CDATA[<>]]> '')
</if>
<!-- </otherwise>-->
<!-- </choose>-->
......@@ -201,7 +201,7 @@
<if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
and (tjmc.instance_id <![CDATA[<>]]> '')
</if>
-- 数据过滤结束 ----------------------------------------------------
</where>
......
......@@ -1419,9 +1419,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (ValidationUtil.isEmpty(useRegistration.getUseUnitName())) {
throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
}
exportParamsMap.put("useUnitName",useRegistration.getUseUnitName().contains("_") ?
useRegistration.getUseUnitName().split("_")[1] :
useRegistration.getUseUnitName());
exportParamsMap.put("useUnitName",useRegistration.getUseUnitName());
// 监管码
if (ValidationUtil.isEmpty(useRegistration.getSupervisoryCode())) {
......
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