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/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -318,6 +318,11 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
 
     List<CountDto> countBizNumAfterUseRegBatchEquip(@Param("records") List<String> records);
 
+    /**
+     * 查询指定的装置集合是否发生过后续业务：使用登记流程中、其他后续业务非已作废、已完成
+     * @param projectContraptionIds 装置ids
+     * @return 是否发生后续业务
+     */
     List<CountDto> countBizNumAfterUseRegBatchProjectContraption(@Param("projectContraptionIds") List<Long> projectContraptionIds);
 
 }

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

@@ -2858,7 +2858,8 @@
                         #{record}
                     </foreach>
                     and a.is_delete = 0
-                    and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废')
+                    and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废' and a.status <![CDATA[ <> ]]> '已完成')
+                    group by b.equ_id
                  UNION all
                      select
                          count(1) as inUseNumber,
@@ -2926,6 +2927,68 @@
                    UNION all
                        select
                             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
+                          a.sequence_nbr = b.enable_disable_apply_id
+                          and a.is_delete = 0
+                          and b.equ_id  in
+                          <foreach collection="records" item="record" separator="," open="(" close=")">
+                              #{record}
+                          </foreach>
+                          and (a.audit_status <![CDATA[ <> ]]> '待提交' and a.audit_status <![CDATA[ <> ]]> '已作废')
+                          group by b.equ_id
+                    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
@@ -2955,27 +3018,24 @@
                 count(1) as inUseNumber,
                 a.project_contraption_id as projectContraptionId
             from
-                tzs_jg_use_registration a,
-                tzs_jg_use_registration_eq b
+                tzs_jg_use_registration a
             where
-                a.sequence_nbr = b.equip_transfer_id
-                and a.project_contraption_id in
+                 a.project_contraption_id in
                 <foreach collection="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">
                     #{projectContraptionId}
                 </foreach>
                 and a.is_delete = 0
-                and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废')
+                and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废'  and a.status <![CDATA[ <> ]]> '已完成')
+                group by  a.project_contraption_id
               union all
                 select
                     count(1) as inUseNumber,
                     a.project_contraption_id as projectContraptionId
                 from
-                tzs_jg_maintain_notice a,
-                tzs_jg_maintain_notice_eq b
+                    tzs_jg_maintain_notice a
                 where
-                a.sequence_nbr = b.equip_transfer_id
-                and a.is_delete = 0
-                and (a.notice_status <![CDATA[ <> ]]> '6617' AND a.notice_status <![CDATA[ <> ]]> '6616')
+                     a.is_delete = 0
+                    and (a.notice_status <![CDATA[ <> ]]> '6617' AND a.notice_status <![CDATA[ <> ]]> '6610')
                     and a.project_contraption_id in
                     <foreach collection="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">
                         #{projectContraptionId}
@@ -2986,12 +3046,10 @@
                     count(1) as inUseNumber,
                     a.project_contraption_id as projectContraptionId
                 from
-                tzs_jg_reform_notice a,
-                tzs_jg_reform_notice_eq b
+                    tzs_jg_reform_notice a
                 where
-                a.sequence_nbr = b.equip_transfer_id
-                and a.is_delete = 0
-                and (a.notice_status <![CDATA[ <> ]]> '6617' AND a.notice_status <![CDATA[ <> ]]> '6616')
+                     a.is_delete = 0
+                    and (a.notice_status <![CDATA[ <> ]]> '6617' AND a.notice_status <![CDATA[ <> ]]> '6610')
                     and a.project_contraption_id in
                     <foreach collection="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">
                         #{projectContraptionId}
@@ -3002,18 +3060,30 @@
                     count(1) as inUseNumber,
                     a.project_contraption_id as projectContraptionId
                 from
-                tzs_jg_change_registration_reform a,
-                tzs_jg_change_registration_reform_eq b
+                    tzs_jg_change_registration_reform a
                     where
-                a.sequence_nbr = b.equip_transfer_id
-                and a.is_delete = 0
-                and ( a.audit_status <![CDATA[ <> ]]> '已作废' AND a.audit_status <![CDATA[ <> ]]> '已完成')
+                     a.is_delete = 0
+                    and ( a.audit_status <![CDATA[ <> ]]> '已作废' AND a.audit_status <![CDATA[ <> ]]> '使用单位待提交')
                     and a.project_contraption_id in
                     <foreach collection="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">
                         #{projectContraptionId}
                     </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="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">
+                        #{projectContraptionId}
+                    </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
@@ -3022,7 +3092,7 @@
                     tzs_jg_change_registration_unit_eq b
                 where
                     a.sequence_nbr = b.unit_change_registration_id
-                and (a.status <![CDATA[ <> ]]> '已作废' AND a.status <![CDATA[ <> ]]> '已完成')
+                    and (a.status <![CDATA[ <> ]]> '已作废' AND a.status <![CDATA[ <> ]]> '使用单位待提交')
                     and a.is_delete = 0
                     and b.project_contraption_id in
                     <foreach collection="projectContraptionIds" item="projectContraptionId" separator="," open="(" close=")">

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/IdxBizJgProjectContraptionServiceImplService.java

@@ -372,7 +372,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                 // 来源类型：前端控制编辑按钮显示隐藏
                 record.setRegType(CommonServiceImpl.genRegTypeByDataSource(record.getDataSource()));
                 // 设置是否发生过后续业务：：前端控制编辑按钮显示隐藏
-                record.setHappenAfterBiz(projectContraptionUseMap.getOrDefault(record.getProjectContraptionNo(), false));
+                record.setHappenAfterBiz(projectContraptionUseMap.getOrDefault(record.getSequenceNbr() + "", false));
             });
 
             List<Long> projectContraptionIdList = pageList.getRecords().stream().map(IdxBizJgProjectContraption::getSequenceNbr).collect(Collectors.toList());

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);
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java

@@ -202,4 +202,10 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
 
     @ApiModelProperty(value = "省内详细办公地址")
     private String officeAddress;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_date")
+    protected Date createDate;
 }

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

@@ -1170,6 +1170,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
 		objects.forEach(item -> newData.add(item.toString()));
 
+		tzBaseEnterpriseInfo.setAppId(regUnitInfo.getAppId());
 		tzBaseEnterpriseInfo.setUnitType(String.join("#", unitTypes));
 
 		boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
@@ -1259,6 +1260,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 				regUnitInfo.setAppId(appId);
 			}
+		} else {
+			regUnitInfo.setAppId("");
 		}
 	}
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -394,6 +394,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
     public TzBaseEnterpriseInfo createBaseEnterpriseInfo(RegUnitInfoDto regUnitInfo, String type) {
         // 1.填充数据
         TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
+        baseEnterpriseInfo.setCreateDate(new Date());
         baseEnterpriseInfo.setUnitType(StringUtils.join(regUnitInfo.getUnitTypeList(), "#"));
         baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode());
         baseEnterpriseInfo.setUseUnit(regUnitInfo.getName());