企业接口字段调整

web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java

@@ -8,10 +8,7 @@ import com.alibaba.cola.dto.SingleResponse;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.basic.info.api.CorpInfoServiceI;
-import com.zcloud.basic.info.dto.CorpDepartmentQry;
+import com.zcloud.basic.info.dto.*;
-import com.zcloud.basic.info.dto.CorpInfoAddCmd;
-import com.zcloud.basic.info.dto.CorpInfoPageQry;
-import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
 import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
 import io.swagger.annotations.Api;
@@ -105,6 +102,12 @@ public class CorpInfoController {
         corpInfoService.changeCompanyName(corpInfoUpdateCmd);
         return SingleResponse.buildSuccess();
     }
+    @ApiOperation("启用停用企业")
+    @PostMapping("/changeUseFlag")
+    public SingleResponse changeEnableFlag(@Validated @RequestBody CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd){
+        corpInfoService.changeEnableFlag(corpInfoUpdateUseFlagCmd);
+        return SingleResponse.buildSuccess();
+    }
 
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java

@@ -7,6 +7,7 @@ import com.jjb.saas.system.client.tenant.request.OtaPlatformUserUpdateCmd;
 import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
 import com.zcloud.basic.info.domain.model.CorpInfoE;
 import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
+import com.zcloud.basic.info.dto.CorpInfoUpdateUseFlagCmd;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
 import lombok.AllArgsConstructor;
@@ -61,5 +62,11 @@ public class CorpInfoUpdateExe {
             //TODO 名字有变动，发送mq
         }
     }
+
+    public void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd) {
+        CorpInfoDO corpInfoDO = new CorpInfoDO();
+        BeanUtils.copyProperties(corpInfoUpdateUseFlagCmd, corpInfoDO);
+        corpInfoRepository.updateById(corpInfoDO);
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java

@@ -91,5 +91,10 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
         Long userId = AuthContext.getUserId();
 //        sysUserUpdateExe.changeCompanyName(userId,corpInfoUpdateCmd.getCorpName());
     }
+
+    @Override
+    public void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd) {
+        corpInfoUpdateExe.changeEnableFlag(corpInfoUpdateUseFlagCmd);
+    }
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java

@@ -2,10 +2,7 @@ package com.zcloud.basic.info.api;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
-import com.zcloud.basic.info.dto.CorpDepartmentQry;
+import com.zcloud.basic.info.dto.*;
-import com.zcloud.basic.info.dto.CorpInfoAddCmd;
-import com.zcloud.basic.info.dto.CorpInfoPageQry;
-import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
 import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
 
@@ -35,5 +32,7 @@ public interface CorpInfoServiceI {
     void changePassword(Long id);
 
     void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd);
+
+    void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd);
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java

@@ -33,8 +33,8 @@ public class CorpDepartmentQry extends PageQuery {
     @ApiModelProperty(value = "分公司状态编码", name = "eqCorpStateCode")
     private String eqCorpStateCode;
 
-    @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "eqIsUse")
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
-    private String eqIsUse;
+    private String eqUseFlag;
 
 
 }

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java

@@ -34,10 +34,10 @@ public class CorpInfoAddCmd extends Command {
     private Integer type;
     @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
     private Integer xgfLevel;
-    @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
+    @ApiModelProperty(value = "企业再列表中的排序", name = "corpOrder", required = true)
-    private Integer corOrder;
+    private Integer corpOrder;
-    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true)
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true)
-    private Integer isUse;
+    private Integer useFlag;
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
     private String code;
     @ApiModelProperty(value = "通讯地址", name = "address", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java

@@ -37,10 +37,10 @@ public class CorpInfoUpdateCmd extends Command {
     private Integer type;
     @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
     private Integer xgfLevel;
-    @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
+    @ApiModelProperty(value = "企业再列表中的排序", name = "corpOrder", required = true)
-    private Integer corOrder;
+    private Integer corpOrder;
-    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true)
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true)
-    private Integer isUse;
+    private Integer useFlag;
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
     private String code;
     @ApiModelProperty(value = "通讯地址", name = "address", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateUseFlagCmd.java

@@ -0,0 +1,36 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.Command;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * web-client
+ *
+ * @Author zhaokai
+ * @Date 2025-10-30 15:12:50
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CorpInfoUpdateUseFlagCmd extends Command {
+    @ApiModelProperty(value = "主键", name = "id", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true)
+    @NotNull(message = "是否启用不能为空")
+    private Integer useFlag;
+
+}
+

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java

@@ -34,11 +34,11 @@ public class CorpInfoXgfAddCmd extends Command {
     @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
     private Integer xgfLevel;
 
-    @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
+    @ApiModelProperty(value = "企业再列表中的排序", name = "corpOrder", required = true)
-    private Integer corOrder;
+    private Integer corpOrder;
 
-    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true)
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true)
-    private Integer isUse;
+    private Integer useFlag;
 
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
     private String code;

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java

@@ -38,10 +38,10 @@ public class CorpInfoXgfUpdateCmd extends Command {
     private Integer type;
     @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
     private Integer xgfLevel;
-    @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
+    @ApiModelProperty(value = "企业再列表中的排序", name = "corpOrder", required = true)
-    private Integer corOrder;
+    private Integer corpOrder;
-    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true)
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true)
-    private Integer isUse;
+    private Integer useFlag;
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
     private String code;
     @ApiModelProperty(value = "通讯地址", name = "address", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpDepartmentCO.java

@@ -34,8 +34,8 @@ public class CorpDepartmentCO extends ClientObject {
     private String corpType4;
     @ApiModelProperty(value = "企业状态")
     private String corpState;
-    @ApiModelProperty(value = "是否启用，1:启用,2:关闭")
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭")
-    private Integer isUse;
+    private Integer useFlag;
 
     @ApiModelProperty(value = "厂级部门数")
     private Integer factoryCount;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java

@@ -34,10 +34,10 @@ public class CorpInfoCO extends ClientObject {
     private Integer xgfLevel;
     //企业再列表中的排序
     @ApiModelProperty(value = "企业再列表中的排序")
-    private Integer corOrder;
+    private Integer corpOrder;
     //是否启用，1:启用,2:关闭
-    @ApiModelProperty(value = "是否启用，1:启用,2:关闭")
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭")
-    private Integer isUse;
+    private Integer useFlag;
     //统一社会信用代码
     @ApiModelProperty(value = "统一社会信用代码")
     private String code;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java

@@ -36,10 +36,10 @@ public class CorpInfoXgfCO extends ClientObject {
     private Integer xgfLevel;
     //企业再列表中的排序
     @ApiModelProperty(value = "企业再列表中的排序")
-    private Integer corOrder;
+    private Integer corpOrder;
     //是否启用，1:启用,2:关闭
-    @ApiModelProperty(value = "是否启用，1:启用,2:关闭")
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭")
-    private Integer isUse;
+    private Integer useFlag;
     //统一社会信用代码
     @ApiModelProperty(value = "统一社会信用代码")
     private String code;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java

@@ -36,8 +36,8 @@ public class CorpDepartmentE extends ClientObject {
     private String corpType4;
     @ApiModelProperty(value = "企业状态")
     private String corpState;
-    @ApiModelProperty(value = "是否启用，1:启用,2:关闭")
+    @ApiModelProperty(value = "是否启用，1:启用,0:关闭")
-    private Integer isUse;
+    private Integer useFlag;
 
     @ApiModelProperty(value = "厂级部门数")
     private Integer factoryCount;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -32,9 +32,9 @@ public class CorpInfoE extends BaseE {
     //相关方等级，1 一级相关方,2 二级相关方
     private Integer xgfLevel;
     //企业再列表中的排序
-    private Integer corOrder;
+    private Integer corpOrder;
-    //是否启用，1:启用,2:关闭
+    //是否启用，1:启用,0:关闭
-    private Integer isUse;
+    private Integer useFlag;
     //统一社会信用代码
     private String code;
     //通讯地址

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java

@@ -26,9 +26,9 @@ public class CorpInfoXgfE extends BaseE {
     //相关方等级，1 一级相关方,2 二级相关方
     private Integer xgfLevel;
     //企业再列表中的排序
-    private Integer corOrder;
+    private Integer corpOrder;
-    //是否启用，1:启用,2:关闭
+    //是否启用，1:启用,0:关闭
-    private Integer isUse;
+    private Integer useFlag;
     //统一社会信用代码
     private String code;
     //通讯地址

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java

@@ -22,10 +22,7 @@ import java.time.LocalDateTime;
 @TableName("corp_info")
 @EqualsAndHashCode(callSuper = true)
 public class CorpInfoDO extends BaseDO {
-    //主键
+
-    @ApiModelProperty(value = "主键")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //企业id
     @ApiModelProperty(value = "企业id")
     private String corpinfoId;
@@ -40,10 +37,10 @@ public class CorpInfoDO extends BaseDO {
     private Integer xgfLevel;
     //企业再列表中的排序
     @ApiModelProperty(value = "企业再列表中的排序")
-    private Integer corOrder;
+    private Integer corpOrder;
     //是否启用，1:启用,2:关闭
     @ApiModelProperty(value = "是否启用，1:启用,0:关闭")
-    private Integer isUse;
+    private Integer useFlag;
     //统一社会信用代码
     @ApiModelProperty(value = "统一社会信用代码")
     private String code;
@@ -224,42 +221,7 @@ public class CorpInfoDO extends BaseDO {
     //是否涉及液氨制冷,1:是,0:否
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否")
     private Integer whetherLiquidammoniaFlag;
-    //乐观锁
+
-    @ApiModelProperty(value = "乐观锁")
-    private Integer version;
-    //创建人
-    @ApiModelProperty(value = "创建人")
-    private Long createId;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-    //更新人
-    @ApiModelProperty(value = "更新人")
-    private Long updateId;
-    //修改人名称
-    @ApiModelProperty(value = "修改人名称")
-    private String updateName;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private LocalDateTime updateTime;
-    //描述
-    @ApiModelProperty(value = "描述")
-    private String remarks;
-    //是否删除
-    @ApiModelProperty(value = "是否删除")
-    private String deleteEnum;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //机构ID
-    @ApiModelProperty(value = "机构ID")
-    private Long orgId;
-    //环境
-    @ApiModelProperty(value = "环境")
-    private String env;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java

@@ -16,5 +16,6 @@ import java.util.Map;
 public interface CorpInfoRepository extends BaseRepository<CorpInfoDO> {
     PageResponse<CorpInfoDO> listPage(Map<String, Object> parmas);
 
+    void changeEnableFlag(CorpInfoDO corpInfoDO);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -37,5 +37,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
+    @Override
+    public void changeEnableFlag(CorpInfoDO corpInfoDO) {
+
+    }
 }