管道变更/单位变更

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
-import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.CertificateVo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -39,7 +39,7 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
 
     List<Map<String, String>> initVehicleUseRegCodeIntoRedis(@Param("year") String year);
 
-    Page<IdxBizJgProjectContraptionVO> queryForUnitByProjectContraptionPage(@Param("page") Page<IdxBizJgProjectContraptionVO> page,
-                                                                            @Param("dto") Map<String, String> params,
-                                                                            @Param("sort") SortVo sortMap);
+    Page<IdxBizJgProjectContraption> queryForUnitByProjectContraptionPage(@Param("page") Page<IdxBizJgProjectContraption> page,
+                                                                          @Param("dto") Map<String, String> params,
+                                                                          @Param("sort") SortVo sortMap);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/IdxBizJgProjectContraptionVO.java

-package com.yeejoin.amos.boot.module.jg.api.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@ApiModel(value = "IdxBizJgProjectContraptionVO", description = "装置VO实体类")
-public class IdxBizJgProjectContraptionVO implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "主键")
-    private String sequenceNbr;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date recDate;
-
-    @ApiModelProperty(value = "工程装置名称")
-    private String projectContraption;
-
-    @ApiModelProperty(value = "工程装置编号")
-    private String projectContraptionNo;
-
-    @ApiModelProperty(value = "使用单位统一信用代码")
-    private String useUnitCreditCode;
-
-    @ApiModelProperty(value = "使用单位名称")
-    private String useUnitName;
-
-    @ApiModelProperty(value = "施工单位统一信用代码")
-    private String uscUnitCreditCode;
-
-    @ApiModelProperty(value = "施工单位名称")
-    private String uscUnitName;
-
-    @ApiModelProperty(value = "设备种类名称")
-    private String equListName;
-
-    @ApiModelProperty(value = "设备种类")
-    private String equList;
-
-    @ApiModelProperty(value = "设备类别名称")
-    private String equCategoryName;
-
-    @ApiModelProperty(value = "设备代码")
-    private String equCategory;
-
-    @ApiModelProperty(value = "设备品种名称")
-    private String equDefineName;
-
-    @ApiModelProperty(value = "设备品种")
-    private String equDefine;
-
-
-    @ApiModelProperty(value = "装置管道总长度(m)")
-    private Double pipelineLength;
-
-    @ApiModelProperty(value = "产品照片附件")
-    private String productPhoto;
-
-    @ApiModelProperty(value = "其他附件")
-    private String otherAccessories;
-
-    @ApiModelProperty(value = "属地监管单位代码")
-    private String orgCode;
-
-    @ApiModelProperty(value = "属地监管单位名称")
-    private String orgName;
-
-    @ApiModelProperty(value = "产品质量合格证明")
-    private String productQualificationCertificate;
-
-    @ApiModelProperty(value = "监管码")
-    private String supervisoryCode;
-
-    @ApiModelProperty(value = "使用登记证编号")
-    private String useRegistrationCode;
-
-    @ApiModelProperty(value = "数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）")
-    private String dataSource;
-
-    @ApiModelProperty(value = "数据来源名称")
-    private String dataSourceName;
-
-    @ApiModelProperty(value = "使用地址")
-    private String fullAddress;
-
-    @ApiModelProperty(value = "工程装置设备代码")
-    private String equCode;
-
-    @ApiModelProperty(value = "设备使用地址")
-    private String equUseAddress;
-
-}

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

@@ -256,7 +256,7 @@
     </select>
 
     <select id="queryForUnitByProjectContraptionPage"
-            resultType="com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO">
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
         SELECT
         ibjpc.*,tjurm.equ_use_address
         FROM

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

@@ -6,10 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.ProjectContraptionChangeDataDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import io.swagger.annotations.Api;
@@ -301,11 +298,11 @@ public class JgUseRegistrationManageController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/unitChangeByProjectContraption/page")
     @ApiOperation(httpMethod = "GET", value = "单位变更选择工程/装置分页查询", notes = "单位变更选择工程/装置分页查询")
-    public ResponseModel<Page<IdxBizJgProjectContraptionVO>> queryForUnitByProjectContraptionPage(@RequestParam Map<String, String> params,
+    public ResponseModel<Page<IdxBizJgProjectContraption>> queryForUnitByProjectContraptionPage(@RequestParam Map<String, String> params,
                                                                                   @RequestParam(value = "sort", required = false) String sort,
                                                                                   @RequestParam(value = "current") int current,
                                                                                   @RequestParam(value = "size") int size) {
-        Page<IdxBizJgProjectContraptionVO> page = new Page<>();
+        Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         if (ValidationUtil.isEmpty(params.get("originalUseUnitCreditCode"))) {

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,16 +18,15 @@ import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
-import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -872,10 +870,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
      * @param sort
      * @return
      */
-    public Page<IdxBizJgProjectContraptionVO> queryForUnitByProjectContraptionPage(Page<IdxBizJgProjectContraptionVO> page, Map<String, String> params, String sort) {
+    public Page<IdxBizJgProjectContraption> queryForUnitByProjectContraptionPage(Page<IdxBizJgProjectContraption> page, Map<String, String> params, String sort) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        Page<IdxBizJgProjectContraptionVO> projectContraptionPage = this.baseMapper.queryForUnitByProjectContraptionPage(page, params, sortMap);
-        List<IdxBizJgProjectContraptionVO> records = projectContraptionPage.getRecords();
+        Page<IdxBizJgProjectContraption> projectContraptionPage = this.baseMapper.queryForUnitByProjectContraptionPage(page, params, sortMap);
+        List<IdxBizJgProjectContraption> records = projectContraptionPage.getRecords();
         if (!ValidationUtil.isEmpty(records)) {
             records.forEach(item -> {
                 BigDecimal pipelineLength = BigDecimal.valueOf(item.getPipelineLength());

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 
@@ -286,4 +287,10 @@ public class IdxBizJgProjectContraption extends BaseEntity {
      */
     @TableField(exist = false)
     private Boolean disableBasicButton;
+
+    /**
+     * 设备使用地址
+     */
+    @TableField(exist = false)
+    private String equUseAddress;
 }