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

@@ -2929,6 +2929,22 @@
                             count(1) as inUseNumber,
                             b.equ_id as record
                         from
+                            tzs_jg_equip_transfer a,
+                            tzs_jg_equip_transfer_eq b
+                        where
+                            a.sequence_nbr = b.equip_transfer_id
+                            and b.equ_id in
+                            <foreach collection="records" item="record" separator="," open="(" close=")">
+                                #{record}
+                            </foreach>
+                            and a.is_delete = 0
+                            and (a.apply_status <![CDATA[ <> ]]> '6617' AND a.apply_status <![CDATA[ <> ]]> '6610')
+                            group by b.equ_id
+                  UNION all
+                      select
+                          count(1) as inUseNumber,
+                          b.equ_id as record
+                      from
                           tzs_jg_enable_disable a,
                           tzs_jg_enable_disable_eq b
                       where
@@ -2943,6 +2959,36 @@
                     UNION all
                         select
                             count(1) as inUseNumber,
+                            b.equ_id as record
+                        from
+                            tzs_jg_vehicle_information a,
+                            tzs_jg_vehicle_information_eq b
+                        where
+                            a.sequence_nbr = b.vehicle_id
+                            and a.is_delete = 0
+                            and b.equ_id in
+                            <foreach collection="records" item="record" separator="," open="(" close=")">
+                                #{record}
+                            </foreach>
+                            and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '已作废')
+                    UNION all
+                        select
+                            count(1) as inUseNumber,
+                            b.equ_id as record
+                        from
+                            tzs_jg_change_vehicle_registration_unit a,
+                            tzs_jg_change_vehicle_registration_unit_eq b
+                        where
+                            a.sequence_nbr = b.unit_change_id
+                            and a.is_delete = 0
+                            and b.equ_id in
+                            <foreach collection="records" item="record" separator="," open="(" close=")">
+                                #{record}
+                            </foreach>
+                            and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '已作废')
+                     UNION all
+                         select
+                             count(1)  as inUseNumber,
                              ne.record
                          from
                              (SELECT
@@ -3024,6 +3070,20 @@
                     </foreach>
                     group by a.project_contraption_id
             union all
+                select
+                    count(1) as inUseNumber,
+                    a.project_contraption_seq as projectContraptionId
+                from
+                    tzs_jg_equip_transfer a
+                where
+                    and a.project_contraption_seq in
+                    <foreach collection="records" item="record" separator="," open="(" close=")">
+                        #{record}
+                    </foreach>
+                    and a.is_delete = 0
+                    and (a.apply_status <![CDATA[ <> ]]> '6617' AND a.apply_status <![CDATA[ <> ]]> '6610')
+                    group by a.project_contraption_seq
+            union all
                 SELECT
                     count(1) as inUseNumber,
                     b.project_contraption_id as projectContraptionId

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/TzsCustomFilterContentDto.java

@@ -37,6 +37,9 @@ public class TzsCustomFilterContentDto extends BaseEntity {
     @ApiModelProperty(value = "筛选条件内容")
     private Object filterContent;
 
+    @ApiModelProperty(value = "选择筛选条件后全部中展示的内容")
+    private Object filterResult;
+
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/TzsCustomFilterContent.java

@@ -71,4 +71,11 @@ public class TzsCustomFilterContent extends BaseEntity {
 	@TableField("filter_type")
     private String filterType;
 
+    /**
+     * 选择筛选条件后全部中展示的内容
+     */
+    @TableField("filter_result")
+    private Object filterResult;
+
+
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/TzsCustomFilterContentServiceImpl.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto
 import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterContentMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -29,6 +30,7 @@ public class TzsCustomFilterContentServiceImpl extends BaseService<TzsCustomFilt
         model.setOrgName(company.getCompanyName());
         model.setCreateUserId(RequestContext.getExeUserId());
         model.setFilterContent(JSONObject.toJSONString(model.getFilterContent()));
+        model.setFilterResult(ObjectUtils.isEmpty(model.getFilterResult()) ? null : JSONObject.toJSONString(model.getFilterResult()));
         model.setCreateTime(new Date());
         return this.createWithModel(model);
     }