历史无证增补增加筛选

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

@@ -39,6 +39,9 @@
     <select id="queryByUseUnitCreditCode" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>
         from tzs_jg_use_registration_manage tjurm
+        <if test="dto.regType != null and dto.regType != '' ">
+            LEFT JOIN tzs_jg_use_registration ur on ur.use_registration_code = tjurm.use_registration_code
+        </if>
         <where>
             tjurm.is_delete = 0
             <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
@@ -62,8 +65,8 @@
             <if test="dto.isCyl != null and dto.isCyl == 1 ">
                 AND tjurm.reg_type != '车用气瓶登记'
             </if>
-            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
-                AND tjurm.reg_type = '车用气瓶登记'
+            <if test="dto.regType != null and dto.regType != '' ">
+                AND ur.reg_type in (0,2)
             </if>
             ORDER BY tjurm.rec_date DESC
         </where>

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

@@ -38,18 +38,19 @@
             <if test="dto.dataType == 'supervision' and client == 'jgAudit' ">
                         AND tjvi.receive_company_code = #{dto.useUnitCreditCode}
                 AND  tjvi.status  <![CDATA[<>]]>  '使用单位待提交'
-               <if test="dto.orgBranchCode  != null and dto.orgBranchCode != ''">
-                   and  tjvi.org_branch_code = #{dto.orgBranchCode}
-               </if>
-            </if>
-            <if test="dto.dataType == 'supervision' and client != 'jgAudit' ">
-                AND  tjvi.org_branch_code LIKE CONCAT(#{dto.orgBranchCode}, '%')
             </if>
-            <if test="dto.dataType == 'company'">
+            <if test="dto.dataType == 'company' ">
                 and  tjvi.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
             <if test="dto.orgBranchCode  != null and dto.orgBranchCode != ''">
+                <choose>
+                    <when test="client == 'jgAudit'">
                         and tjvi.org_branch_code = #{dto.orgBranchCode}
-                </if>
+                    </when>
+                    <otherwise>
+                        AND tjvi.org_branch_code LIKE CONCAT(#{dto.orgBranchCode}, '%')
+                    </otherwise>
+                </choose>
             </if>
         </where>
         order by

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -154,7 +154,7 @@ public class EquipmentCategoryController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
     @GetMapping(value = "/tree")
-    public ResponseModel<Object> tree(@RequestParam(value = "code", required = false) String code) throws Exception {
+    public ResponseModel<Object> tree(@RequestParam(value = "code", required = false) String code,@RequestParam(value = "dataSource", required = false) String dataSource) throws Exception {
         if (ObjectUtils.isEmpty(code)) {
             return ResponseHelper.buildResponse(new ArrayList<>());
         }
@@ -165,6 +165,13 @@ public class EquipmentCategoryController extends BaseController {
         Menu menu = new Menu(root.getId(), root.getName(), 0L, 0);
         List<Menu> menus = TreeParser.getTree(root.getId(), list, EquipmentCategory.class.getName(), "getId", 0, "getName",
                 "getParentId", null, "getCode");
+        if (Objects.nonNull(dataSource)&&"jg_his_black".equals(dataSource)){
+            for (Menu menu1 : menus) {
+                if (menu1.getName().equals("特种气瓶")){
+                    menu1.setName("特种气瓶"+"(非车用气瓶)");
+                }
+            }
+        }
         menu.setChildren(menus);
         List<Menu> tree = new ArrayList<>();
         tree.add(menu);