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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -27,9 +27,6 @@
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>
-            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
-                and tjvi.org_branch_code like concat(#{dto.orgBranchCode},'%')
-            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -144,7 +144,7 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
-            dto.setOrgBranchCode(info.getCompany().getOrgCode());
+            dto.setOrgBranchCode(dto.getOrgBranchCode() != null ? dto.getOrgBranchCode() : info.getCompany().getOrgCode());
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/UseInfoMapper.xml

@@ -27,7 +27,7 @@
             register.EQU_CODE,
             register.EQU_LIST,
             supervision.ORG_BRANCH_CODE,
-            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.REC_DATE desc limit 1) as NEXT_INSPECT_DATE
+            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.INSPECT_DATE desc limit 1) as NEXT_INSPECT_DATE
             FROM
             idx_biz_jg_use_info use
             LEFT JOIN	idx_biz_jg_register_info register on register.RECORD = use.RECORD