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/dto/JgChangeRegistrationReformDto.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 改造变更登记
@@ -15,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationReformDto", description="改造变更登记")
-public class JgChangeRegistrationReformDto  extends BaseDto {
+@ApiModel(value = "JgChangeRegistrationReformDto", description = "改造变更登记")
+public class JgChangeRegistrationReformDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "设备监管码")
@@ -108,4 +110,11 @@ public class JgChangeRegistrationReformDto  extends BaseDto {
     @ApiModelProperty(value = "任务发起人id")
     private String promoter;
 
+
+    private List<String> roleIds;
+
+    private String dataType;
+
+    private String unitCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java

@@ -201,6 +201,5 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "promoter")
     private String promoter;
-    
-    private List<String> roleIds;
+
 }

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
-    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,7 +18,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeRegistrationReform> {
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReform dto , @Param("roleIds") List<String> roleIds);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReformDto dto , @Param("roleIds") List<String> roleIds);
 
     Map<String, Object> getDetail(@Param("id")String id);
 

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
-    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-18
  */
 public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
-    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -31,15 +31,15 @@
 
         <where>
             and  ur.is_delete = 0
-            <if test="dto.equCategory != null and dto.equCategory != ''">
-                and jri.EQU_CATEGORY = #{dto.equCategory}
-            </if>
+<!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
+<!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
+<!--            </if>-->
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
-            <if test="dto.equCode != null and dto.equCode != ''">
-                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
-            </if>
+<!--            <if test="dto.equCode != null and dto.equCode != ''">-->
+<!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
+<!--            </if>-->
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -88,7 +89,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
 	@GetMapping(value = "/getList")
-	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReform dto,
+	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);

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

@@ -91,7 +91,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     /**
      * 分页查询
      */
-    public Page<Map<String, Object>> getList(JgChangeRegistrationReform dto, Page<Map<String, Object>> page, List<String> roleIds) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
     }