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/JgUseRegistrationMapper.xml

@@ -32,7 +32,8 @@
         ur.receive_org_name as receiveOrgName,
         ur.next_execute_user_ids as nextExecuteUserIds,
         ur.next_task_id as nextTaskId,
-        ur.create_user_id as createUserId
+        ur.create_user_id as createUserId,
+        ur.rec_date as recDate
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
@@ -97,7 +98,7 @@
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
         </where>)
-            order by regDate desc
+            order by regDate desc, recDate desc
     </select>
     <select id="getDetail" resultType="java.util.Map">
         SELECT

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -1256,6 +1256,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE",test));
             boolMust.must(pBuilder);
         }
+        // 是否车用气瓶
+        if (!ObjectUtils.isEmpty(map.getString("WHETHER_VEHICLE_CYLINDER"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("WHETHER_VEHICLE_CYLINDER"));
+            pBuilder.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER",test));
+            boolMust.must(pBuilder);
+        }
 
 
         builder.query(boolMust);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -129,4 +129,7 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String DATA_SOURCE;
+
+    @Field(type = FieldType.Text)
+    private String WHETHER_VEHICLE_CYLINDER;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java

@@ -169,4 +169,13 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
 	@TableField("\"OTHER_ACCESSORIES_REG\"")
     private String otherAccessoriesReg;
 
+    /**
+     * 是否车用气瓶（特种气瓶用于区分“内装填料气瓶、纤维缠绕气瓶、低温绝热气瓶”和车用气瓶）
+     *  1：是
+     *  0：不是
+     */
+	@TableField("\"WHETHER_VEHICLE_CYLINDER\"")
+    private String whetherVehicleCylinder;
+
+
 }

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

@@ -101,6 +101,7 @@
                BRAND_NAME,
                EQU_TYPE,
                DATA_SOURCE,
+               WHETHER_VEHICLE_CYLINDER,
                DATE_FORMAT(PRODUCE_DATE, '%Y-%m-%d %H:%i:%s') as PRODUCE_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}