Changes

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgEnterpriseInfoDto.java → amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

@@ -2,18 +2,18 @@ package com.yeejoin.amos.boot.module.tzs.api.dto;
 
     import java.util.Date;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+    import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Data;
 /**
 * 企业数据信息Dto
 *
 * @author duanwei
-* @date 2022-07-26
+* @date 2022-08-10
 */
 @Data
-public class TzsJgEnterpriseInfoDto extends BaseDto {
+public class TzBaseEnterpriseInfoDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
@@ -37,9 +37,14 @@ public class TzsJgEnterpriseInfoDto extends BaseDto {
     * 使用单位证件类型
     */
     private String useUnitCertificate;
-            @ApiModelProperty(value = "使用单位代码")
+            @ApiModelProperty(value = "单位类型")
+    /**
+    * 单位类型
+    */
+    private String unitType;
+            @ApiModelProperty(value = "使用单位统一信用代码")
     /**
-    * 使用单位代码
+    * 使用单位统一信用代码
     */
     private String useCode;
             @ApiModelProperty(value = "使用单位名称")
@@ -47,6 +52,16 @@ public class TzsJgEnterpriseInfoDto extends BaseDto {
     * 使用单位名称
     */
     private String useUnit;
+            @ApiModelProperty(value = "监管机构组织机构代码")
+    /**
+    * 监管机构组织机构代码
+    */
+    private String superviseOrgCode;
+            @ApiModelProperty(value = "监管机构名称")
+    /**
+    * 监管机构名称
+    */
+    private String superviseOrgName;
             @ApiModelProperty(value = "是否重点监控单位")
     /**
     * 是否重点监控单位
@@ -172,6 +187,66 @@ public class TzsJgEnterpriseInfoDto extends BaseDto {
     * 操作人员
     */
     private String recUserId;
+            @ApiModelProperty(value = "管辖机构")
+    /**
+    * 管辖机构
+    */
+    private String governingBody;
+            @ApiModelProperty(value = "数据来源")
+    /**
+    * 数据来源
+    */
+    private String dataSources;
+            @ApiModelProperty(value = "所属行业")
+    /**
+    * 所属行业
+    */
+    private String industry;
+            @ApiModelProperty(value = "登记机关")
+    /**
+    * 登记机关
+    */
+    private String registrationAuthority;
+            @ApiModelProperty(value = "核准时间")
+    /**
+    * 核准时间
+    */
+    private Date approvalTime;
+            @ApiModelProperty(value = "经营状态")
+    /**
+    * 经营状态
+    */
+    private String operatingStatus;
+            @ApiModelProperty(value = "维保负责人")
+    /**
+    * 维保负责人
+    */
+    private String maintenPerson;
+            @ApiModelProperty(value = "维保负责人联系电话")
+    /**
+    * 维保负责人联系电话
+    */
+    private String maintenTelephone;
+            @ApiModelProperty(value = "质量保证工程师")
+    /**
+    * 质量保证工程师
+    */
+    private String sqa;
+            @ApiModelProperty(value = "质量负责人")
+    /**
+    * 质量负责人
+    */
+    private String qualityPerson;
+            @ApiModelProperty(value = "质量负责人电话")
+    /**
+    * 质量负责人电话
+    */
+    private String qualityTelephone;
+            @ApiModelProperty(value = "技术负责人")
+    /**
+    * 技术负责人
+    */
+    private String technicalPerson;
 
 
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.entity;
 
 import java.util.Date;
-
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 企业数据信息
  *
  * @author duanwei
- * @date 2022-07-26
+ * @date 2022-08-10
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_jg_enterprise_info")
-@ApiModel(value="TzsJgEnterpriseInfo对象", description="企业数据信息")
-public class TzsJgEnterpriseInfo extends BaseEntity {
+@ApiModel(value="TzBaseEnterpriseInfo对象", description="企业数据信息")
+public class TzBaseEnterpriseInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+
     @ApiModelProperty(value = "使用单位唯一标识")
     private String useUnitCode;
 
@@ -33,12 +37,21 @@ public class TzsJgEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "使用单位证件类型")
     private String useUnitCertificate;
 
-    @ApiModelProperty(value = "使用单位代码")
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
     private String useCode;
 
     @ApiModelProperty(value = "使用单位名称")
     private String useUnit;
 
+    @ApiModelProperty(value = "监管机构组织机构代码")
+    private String superviseOrgCode;
+
+    @ApiModelProperty(value = "监管机构名称")
+    private String superviseOrgName;
+
     @ApiModelProperty(value = "是否重点监控单位")
     private String keyUnit;
 
@@ -108,4 +121,43 @@ public class TzsJgEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
+
+
+    @ApiModelProperty(value = "管辖机构")
+    private String governingBody;
+
+    @ApiModelProperty(value = "数据来源")
+    private String dataSources;
+
+    @ApiModelProperty(value = "所属行业")
+    private String industry;
+
+    @ApiModelProperty(value = "登记机关")
+    private String registrationAuthority;
+
+    @ApiModelProperty(value = "核准时间")
+    private Date approvalTime;
+
+    @ApiModelProperty(value = "经营状态")
+    private String operatingStatus;
+
+    @ApiModelProperty(value = "维保负责人")
+    private String maintenPerson;
+
+    @ApiModelProperty(value = "维保负责人联系电话")
+    private String maintenTelephone;
+
+    @ApiModelProperty(value = "质量保证工程师")
+    private String sqa;
+
+    @ApiModelProperty(value = "质量负责人")
+    private String qualityPerson;
+
+    @ApiModelProperty(value = "质量负责人电话")
+    private String qualityTelephone;
+
+    @ApiModelProperty(value = "技术负责人")
+    private String technicalPerson;
+
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzsJgEnterpriseInfoMapper.java → amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzBaseEnterpriseInfoMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgEnterpriseInfo;
 
 /**
  * 企业数据信息 Mapper 接口
  *
  * @author duanwei
- * @date 2022-07-26
+ * @date 2022-08-10
  */
-public interface TzsJgEnterpriseInfoMapper extends BaseMapper<TzsJgEnterpriseInfo> {
+public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzsJgEnterpriseInfoService.java → amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgEnterpriseInfo;
 
 /**
  * 企业数据信息 服务类
  *
  * @author duanwei
- * @date 2022-07-26
+ * @date 2022-08-10
  */
-public interface ITzsJgEnterpriseInfoService extends IService<TzsJgEnterpriseInfo> {
+public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCarcylFillInfoDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 车用气瓶充装信息（清洗后）Dto
+*
+* @author duanwei
+* @date 2022-08-08
+*/
+@Data
+public class TzCarcylFillInfoDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+            @ApiModelProperty(value = "充装单位名称 ")
+    /**
+    * 充装单位名称
+
+    */
+    private String companyName;
+            @ApiModelProperty(value = "单位统一信用代码 ")
+    /**
+    * 单位统一信用代码
+
+    */
+    private String companyCode;
+            @ApiModelProperty(value = "所属机构 ")
+    /**
+    * 所属机构
+
+    */
+    private String dept;
+            @ApiModelProperty(value = "使用登记证编号 ")
+    /**
+    * 使用登记证编号
+
+    */
+    private String useCode;
+            @ApiModelProperty(value = "充装日期 ")
+    /**
+    * 充装日期
+
+    */
+    private String gasDate;
+            @ApiModelProperty(value = "充装检查人员 ")
+    /**
+    * 充装检查人员
+
+    */
+    private String gasCheckName;
+            @ApiModelProperty(value = "充装人员 ")
+    /**
+    * 充装人员
+
+    */
+    private String gasName;
+            @ApiModelProperty(value = "充装介质 ")
+    /**
+    * 充装介质
+
+    */
+    private String gasMedia;
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCarcylInspectDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 车用气瓶检验信息（清洗后）Dto
+*
+* @author duanwei
+* @date 2022-08-08
+*/
+@Data
+public class TzCarcylInspectDto  {
+
+    private static final long serialVersionUID = 1L;
+
+
+            @ApiModelProperty(value = "检验机构名称 ")
+    /**
+    * 检验机构名称
+
+    */
+    private String checkDeptName;
+            @ApiModelProperty(value = "机构核准证书编号 ")
+    /**
+    * 机构核准证书编号
+
+    */
+    private String organizationDeptCode;
+            @ApiModelProperty(value = "组织机构代码 ")
+    /**
+    * 组织机构代码
+
+    */
+    private String organizationCode;
+            @ApiModelProperty(value = "所属机构 ")
+    /**
+    * 所属机构
+
+    */
+    private String organizationName;
+
+    private String userCode;
+
+            @ApiModelProperty(value = "检验日期 ")
+    /**
+    * 检验日期
+
+    */
+    private String checkDate;
+            @ApiModelProperty(value = "下次检验日期 ")
+    /**
+    * 下次检验日期
+
+    */
+    private String nextCheckDate;
+            @ApiModelProperty(value = "检验结果 ")
+    /**
+    * 检验结果
+
+    */
+    private String checkResult;
+            @ApiModelProperty(value = "气瓶报废日期 ")
+    /**
+    * 气瓶报废日期
+
+    */
+    private Date gasDisableDate;
+            @ApiModelProperty(value = "检验发现的主要问题 ")
+    /**
+    * 检验发现的主要问题
+
+    */
+    private String mainProblem;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCarcylRegDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+    import java.util.Date;
+
+    import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Data;
+/**
+* 车用气瓶使用登记信息（清洗后）Dto
+*
+* @author duanwei
+* @date 2022-08-08
+*/
+@Data
+public class TzCarcylRegDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 地区代码
+     */
+    private String regionCode;
+
+            @ApiModelProperty(value = "id")
+    /**
+    * id
+    */
+    private Long sequenceNbr;
+            @ApiModelProperty(value = "使用单位名称")
+    /**
+    * 使用单位名称
+    */
+    private String compontName;
+            @ApiModelProperty(value = "单位统一信用代码")
+    /**
+    * 单位统一信用代码
+    */
+    private String compontCode;
+            @ApiModelProperty(value = "所属机构 ")
+    /**
+    * 所属机构
+
+    */
+    private String dept;
+            @ApiModelProperty(value = "地址 ")
+    /**
+    * 地址
+
+    */
+    private String address;
+            @ApiModelProperty(value = "联系人 ")
+    /**
+    * 联系人
+
+    */
+    private String legalPerson;
+            @ApiModelProperty(value = "电话 ")
+    /**
+    * 电话
+
+    */
+    private String legalPhone;
+            @ApiModelProperty(value = "车牌号 ")
+    /**
+    * 车牌号
+
+    */
+    private String carNum;
+            @ApiModelProperty(value = "气瓶使用登记机关 ")
+    /**
+    * 气瓶使用登记机关
+
+    */
+    private String gasDeptName;
+            @ApiModelProperty(value = "使用登记证编号 ")
+    /**
+    * 使用登记证编号
+
+    */
+    private String useNum;
+            @ApiModelProperty(value = "投入使用日期 ")
+    /**
+    * 投入使用日期
+
+    */
+    private String startTime;
+            @ApiModelProperty(value = "下次检验日期 ")
+    /**
+    * 下次检验日期
+
+    */
+    private String endTime;
+
+
+
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCarcylTraceDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TzCarcylTraceDto {
+    private TzCarcylRegDto tzCarcylRegDto;
+    private List<TzCarcylInspectDto> tzCarcylInspectDtoList;
+    private List<TzCarcylFillInfoDto> tzCarcylFillInfoDtoList;
+
+    public TzCarcylTraceDto(TzCarcylRegDto tzCarcylRegDto, List<TzCarcylInspectDto> tzCarcylInspectDtoList, List<TzCarcylFillInfoDto> tzCarcylFillInfoDtoList) {
+        this.tzCarcylRegDto = tzCarcylRegDto;
+        this.tzCarcylInspectDtoList = tzCarcylInspectDtoList;
+        this.tzCarcylFillInfoDtoList = tzCarcylFillInfoDtoList;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/TzCarcylReg.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* 车用气瓶使用登记信息（清洗后）
+*
+* @author duanwei
+* @date 2022-08-08
+*/
+@Data
+public class TzCarcylReg  {
+
+    private static final long serialVersionUID = 1L;
+
+
+            @ApiModelProperty(value = "使用单位名称")
+    /**
+    * 使用单位名称
+    */
+    private String compontName;
+            @ApiModelProperty(value = "单位统一信用代码")
+    /**
+    * 单位统一信用代码
+    */
+    private String compontCode;
+            @ApiModelProperty(value = "所属机构 ")
+    /**
+    * 所属机构
+
+    */
+    private String dept;
+            @ApiModelProperty(value = "地址 ")
+    /**
+    * 地址
+
+    */
+    private String address;
+            @ApiModelProperty(value = "联系人 ")
+    /**
+    * 联系人
+
+    */
+    private String legalPerson;
+            @ApiModelProperty(value = "电话 ")
+    /**
+    * 电话
+
+    */
+    private String legalPhone;
+            @ApiModelProperty(value = "车牌号 ")
+    /**
+    * 车牌号
+
+    */
+    private String carNum;
+            @ApiModelProperty(value = "气瓶使用登记机关 ")
+    /**
+    * 气瓶使用登记机关
+
+    */
+    private String gasDeptName;
+            @ApiModelProperty(value = "使用登记证编号 ")
+    /**
+    * 使用登记证编号
+
+    */
+    private String useNum;
+            @ApiModelProperty(value = "投入使用日期 ")
+    /**
+    * 投入使用日期
+
+    */
+    private Date startTime;
+            @ApiModelProperty(value = "下次检验日期 ")
+    /**
+    * 下次检验日期
+
+    */
+    private Date endTime;
+            @ApiModelProperty(value = "创建时间 ")
+    /**
+    * 创建时间
+
+    */
+    private Date recDate;
+            @ApiModelProperty(value = "操作人员 ")
+    /**
+    * 操作人员
+
+    */
+    private String recUserId;
+
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/TzCarcylMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylFillInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylInspectDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylRegDto;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.TzCarcylReg;
+
+import java.util.List;
+
+/**
+ * 车用气瓶使用登记信息（清洗后） Mapper 接口
+ *
+ * @author duanwei
+ * @date 2022-08-08
+ */
+public interface TzCarcylMapper extends BaseMapper<TzCarcylReg> {
+
+    /**
+     * @param page 分頁内容
+     * @param TzCarcylRegDto 筛选内容
+     * @return
+     */
+    IPage<TzCarcylRegDto> pageByOrgCode(Page<TzCarcylRegDto> page, TzCarcylRegDto TzCarcylRegDto,String superviseOrgCode);
+
+    IPage<TzCarcylRegDto> pageByCompanyCode(Page<TzCarcylRegDto> page, TzCarcylRegDto TzCarcylRegDto,String companyCode);
+
+    TzCarcylRegDto getUserInfoger(String sequenceNbr);
+
+    String getUseNum(String sequenceNbr);
+
+    List<TzCarcylFillInfoDto> getFillingInfo(String useCode);
+
+    List<TzCarcylInspectDto> getCheckingInfo(String useCode);
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ITzCarcylService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylRegDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylTraceDto;
+
+/**
+ * 车用气瓶使用登记信息（列表） 服务类
+ *
+ * @author duanwei
+ * @date 2022-08-08
+ */
+public interface ITzCarcylService {
+
+    IPage<TzCarcylRegDto> page(PageParam pageParam, TzCarcylRegDto idxBizCarcylUserCompany, String key);
+
+    TzCarcylTraceDto getTrace(String sequenceNbr);
+
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzsJgEnterpriseInfoMapper.xml → amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.precontrol.common.mapper.TzsJgEnterpriseInfoMapper">
+<mapper namespace="com.yeejoin.precontrol.common.mapper.TzBaseEnterpriseInfoMapper">
 
 </mapper>

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

+package com.yeejoin.amos.boot.module.tzs.biz.controller;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.Arrays;
+
+
+/**
+ * 企业数据信息
+ *
+ * @author duanwei
+ * @date 2022-08-10
+ */
+@RestController
+@Api(tags = "企业数据信息Api")
+@RequestMapping(value = "/baseEnterprise", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+public class TzBaseEnterpriseInfoController {
+
+  @Autowired
+  ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
+
+
+    /**
+    * 新增企业数据信息
+    * @return
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增企业数据信息", notes = "新增企业数据信息")
+    public boolean saveTzBaseEnterpriseInfo(HttpServletRequest request, @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
+    return iTzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+    return iTzBaseEnterpriseInfoService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改企业数据信息
+    * @return
+    */
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改企业数据信息", notes = "修改企业数据信息")
+    public boolean updateByIdTzBaseEnterpriseInfo(HttpServletRequest request, @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
+    return iTzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
+    }
+
+
+
+    /**
+   * 根据id查询
+   * @param id
+   * @return
+   */
+   @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+   @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+   public TzBaseEnterpriseInfo selectById(HttpServletRequest request, @PathVariable Long id){
+      return iTzBaseEnterpriseInfoService.getById(id);
+   }
+
+
+
+  /**
+  * 列表分页查询
+  * @return
+  */
+  @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+  @RequestMapping(value = "/list", method = RequestMethod.GET)
+  @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+  public IPage<TzBaseEnterpriseInfo> listPage(String pageNum,String pageSize,
+    TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
+
+    Page<TzBaseEnterpriseInfo> pageBean;
+    QueryWrapper<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoQueryWrapper = new QueryWrapper<>();
+    Class<? extends TzBaseEnterpriseInfo> aClass = tzBaseEnterpriseInfo.getClass();
+    Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+        try {
+            field.setAccessible(true);
+            Object o = field.get(tzBaseEnterpriseInfo);
+            if (o != null) {
+                Class<?> type = field.getType();
+                String name = NameUtils.camel2Underline(field.getName());
+                if (type.equals(Integer.class)) {
+                Integer fileValue = (Integer) field.get(tzBaseEnterpriseInfo);
+                tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
+                } else if (type.equals(Long.class)) {
+                Long fileValue = (Long) field.get(tzBaseEnterpriseInfo);
+                tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
+                } else if (type.equals(String.class)) {
+                String fileValue = (String) field.get(tzBaseEnterpriseInfo);
+                tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
+                } else {
+                String fileValue = (String) field.get(tzBaseEnterpriseInfo);
+                tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
+            }
+          }
+        }catch (Exception e) {
+        }
+    });
+    IPage<TzBaseEnterpriseInfo> page;
+    if (StringUtils.isBlank(pageNum)  ||StringUtils.isBlank(pageSize)) {
+        pageBean = new Page<>(0, Long.MAX_VALUE);
+    }else{
+        pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+    }
+    page = iTzBaseEnterpriseInfoService.page(pageBean, tzBaseEnterpriseInfoQueryWrapper);
+    return page;
+  }
+}
+
+

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
-import org.springframework.stereotype.Service;
-
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgEnterpriseInfo;
-import com.yeejoin.amos.boot.module.tzs.api.mapper.TzsJgEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgEnterpriseInfoService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 /**
  * 企业数据信息 服务实现类
  *
  * @author duanwei
- * @date 2022-07-26
+ * @date 2022-08-10
  */
 @Service
-public class TzsJgEnterpriseInfoServiceImpl extends ServiceImpl<TzsJgEnterpriseInfoMapper, TzsJgEnterpriseInfo> implements ITzsJgEnterpriseInfoService {
+public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService {
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CarCylController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylRegDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylTraceDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCarcylService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@RestController
+@Api(tags = "车用气瓶Api")
+@RequestMapping(value = "/carcyl")
+public class CarCylController {
+
+    @Autowired
+    private ITzCarcylService iTzCarcylService;
+
+    /**
+     * 列表分页查询
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询")
+    public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
+        return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
+    }
+
+    /**
+     * 追溯详情查询
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询")
+    public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
+        return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
+    }
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylFillInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylInspectDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylRegDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCarcylTraceDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.TzCarcylReg;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.TzCarcylMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCarcylService;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+
+/**
+ * 车用气瓶使用登记信息（列表） 服务实现类
+ *
+ * @author duanwei
+ * @date 2022-08-08
+ */
+@Service
+public class TzCarcylServiceImpl extends BaseService<TzCarcylRegDto, TzCarcylReg, TzCarcylMapper> implements ITzCarcylService {
+
+    @Autowired
+    private TzCarcylMapper tzCarcylMapper;
+
+    @Override
+    public IPage<TzCarcylRegDto> page(PageParam pageParam, TzCarcylRegDto idxBizCarcylUserCompany , String key) {
+        Page<TzCarcylRegDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+
+        if(ValidationUtil.isEmpty(key)){
+            System.out.println("key没值");
+            Long sequenceNbr = Privilege.agencyUserClient.getme().getResult().getOrgRoleSeqs().keySet().iterator().next();
+            String companyCode = Privilege.companyClient.seleteOne(sequenceNbr).getResult().getCompanyCode();
+            return tzCarcylMapper.pageByCompanyCode(page, idxBizCarcylUserCompany, companyCode);
+
+        }else{
+            System.out.println("key有值："+key);
+            String superviseOrgCode = Privilege.companyClient.seleteOne(Long.valueOf(key)).getResult().getOrgCode();
+            return tzCarcylMapper.pageByOrgCode(page, idxBizCarcylUserCompany, superviseOrgCode);
+        }
+
+    }
+
+    @Override
+    public TzCarcylTraceDto getTrace(String sequenceNbr) {
+        TzCarcylRegDto tzCarcylRegDto = tzCarcylMapper.getUserInfoger(sequenceNbr);
+        String useCode = tzCarcylMapper.getUseNum(sequenceNbr);
+        List<TzCarcylFillInfoDto> tzCarcylFillInfoDtoList = tzCarcylMapper.getFillingInfo(useCode);
+        List<TzCarcylInspectDto> tzCarcylInspectDtoList = tzCarcylMapper.getCheckingInfo(useCode);
+        TzCarcylTraceDto tzCarcylTraceDto = new TzCarcylTraceDto(tzCarcylRegDto,tzCarcylInspectDtoList,tzCarcylFillInfoDtoList);
+        return tzCarcylTraceDto;
+    }
+
+
+}