Merge remote-tracking branch 'origin/main' into main

.gitignore

@@ -8,9 +8,11 @@ target/
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea/
 *.iws
 *.iml
 *.ipr
+*.xml
 
 ### Eclipse ###
 .apt_generated
@@ -36,5 +38,4 @@ build/
 
 ### Mac OS ###
 .DS_Store
-/.idea/
+
-/.idea/

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

@@ -22,19 +22,10 @@ public class CorpInfoAddExe {
     private final CorpInfoGateway corpInfoGateway;
 
     @Transactional(rollbackFor = Exception.class)
-    public boolean execute(CorpInfoAddCmd cmd) {
+    public Long execute(CorpInfoAddCmd cmd) {
         CorpInfoE examTypeE = new CorpInfoE();
         BeanUtils.copyProperties(cmd, examTypeE);
-        boolean res = false;
+        return corpInfoGateway.add(examTypeE);
-        try {
-            res = corpInfoGateway.add(examTypeE);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        if (!res) {
-            throw new BizException("保存失败");
-        }
-        return true;
     }
 }
 

web-app/src/main/java/com/zcloud/basic/info/enums/CorpTypeEnum.java

@@ -0,0 +1,23 @@
+package com.zcloud.basic.info.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum CorpTypeEnum {
+    OrdinaryEnterprises(0,"普通企业"),
+    groupUnits(1, "集团单位"),
+    share(2,"股份单位"),
+    serviceProvider(3, "相关方企业"),
+    cargoOwner(4, "货主单位"),
+    portUnit(5, "驻港单位");
+
+
+    private final Integer code;
+    private final String name;
+
+    CorpTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+}

web-app/src/main/java/com/zcloud/basic/info/enums/UserTypeEnum.java

@@ -0,0 +1,30 @@
+package com.zcloud.basic.info.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum UserTypeEnum {
+    JG(1,"监管"),
+    QY(2,"企业"),
+    XGF(3,"相关方")
+    ;
+    private final Integer code;
+    private final String name;
+
+    UserTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static Integer getUserType(Integer corpType){
+        if (corpType.equals(CorpTypeEnum.OrdinaryEnterprises.getCode()) ||
+            corpType.equals(CorpTypeEnum.groupUnits.getCode())){
+            return UserTypeEnum.QY.getCode();
+        }else if (corpType.equals(CorpTypeEnum.share.getCode())){
+            return UserTypeEnum.JG.getCode();
+        }else {
+            return UserTypeEnum.XGF.getCode();
+        }
+    }
+
+}

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

@@ -2,17 +2,18 @@ package com.zcloud.basic.info.service;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.basic.info.api.CorpInfoServiceI;
 import com.zcloud.basic.info.command.CorpInfoAddExe;
 import com.zcloud.basic.info.command.CorpInfoRemoveExe;
 import com.zcloud.basic.info.command.CorpInfoUpdateExe;
+import com.zcloud.basic.info.command.SysUserAddExe;
 import com.zcloud.basic.info.command.query.CorpInfoQueryExe;
-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 com.zcloud.basic.info.enums.UserTypeEnum;
+import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,7 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
     private final CorpInfoUpdateExe corpInfoUpdateExe;
     private final CorpInfoRemoveExe corpInfoRemoveExe;
     private final CorpInfoQueryExe corpInfoQueryExe;
+    private final SysUserAddExe sysUserAddExe;
 
     @Override
     public PageResponse<CorpInfoCO> listPage(CorpInfoPageQry qry) {
@@ -41,7 +43,15 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
     @Override
     public SingleResponse add(CorpInfoAddCmd cmd) {
 
-        corpInfoAddExe.execute(cmd);
+        Long userId = AuthContext.getUserId();
+        Long id = corpInfoAddExe.execute(cmd);
+
+        //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
+        SysUserAddCmd user = new SysUserAddCmd();
+        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
+                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
+                .setDepartmentId(id);
+        sysUserAddExe.execute(user);
         return SingleResponse.buildSuccess();
     }
 

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

@@ -11,6 +11,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
 
 import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -46,12 +47,12 @@ public class CorpInfoAddCmd extends Command {
     @ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
     private String companyArea;
     @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
-    private String firstServeDate;
+    private LocalDate firstServeDate;
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String scale;
     @ApiModelProperty(value = "成立时间", name = "createDate", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createDate;
+    private LocalDate createDate;
     @ApiModelProperty(value = "企业状态", name = "corpState", required = true)
     private String corpState;
     @ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@@ -142,6 +143,11 @@ public class CorpInfoAddCmd extends Command {
 
     @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
     private String fourtype;
+    @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
+    private LocalDate licenseStart;
+
+    @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
+    private LocalDate licenseEnd;
     @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
     private Integer whetherHygiene;
     @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -48,11 +49,11 @@ public class CorpInfoUpdateCmd extends Command {
     @ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
     private String companyArea;
     @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
-    private String firstServeDate;
+    private LocalDate firstServeDate;
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String scale;
     @ApiModelProperty(value = "成立时间", name = "createDate", required = true)
-    private LocalDateTime createDate;
+    private LocalDate createDate;
     @ApiModelProperty(value = "企业状态", name = "corpState", required = true)
     private String corpState;
     @ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@@ -143,6 +144,11 @@ public class CorpInfoUpdateCmd extends Command {
 
     @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
     private String fourtype;
+    @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
+    private LocalDate licenseStart;
+
+    @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
+    private LocalDate licenseEnd;
     @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
     private Integer whetherHygiene;
     @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)

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

@@ -6,8 +6,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -20,10 +22,11 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class SysUserAddCmd extends Command {
     @ApiModelProperty(value = "GBS用户id", name = "id", required = true)
-    @NotEmpty(message = "GBS用户id不能为空")
+    @NotNull(message = "GBS用户id不能为空")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(value = "用户id", name = "userId", required = true)
     @NotEmpty(message = "用户id不能为空")
     private String userId;
@@ -37,17 +40,17 @@ public class SysUserAddCmd extends Command {
     @NotEmpty(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "企业", name = "corpinfoId", required = true)
-    @NotEmpty(message = "企业不能为空")
+    @NotNull(message = "企业不能为空")
-    private String corpinfoId;
+    private Long corpinfoId;
     @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
-    @NotEmpty(message = "部门id不能为空")
+    @NotNull(message = "部门id不能为空")
-    private String departmentId;
+    private Long departmentId;
     @ApiModelProperty(value = "角色id", name = "roleIds", required = true)
     @NotEmpty(message = "角色id不能为空")
     private String roleIds;
     @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true)
     @NotEmpty(message = "1监管2企业3相关方不能为空")
-    private String userType;
+    private Integer userType;
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制", name = "status", required = true)
     @NotEmpty(message = "状态0.正常 99.锁定 2密码错误次数超过当天限制不能为空")
     private String status;

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -22,8 +23,8 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 public class SysUserUpdateCmd extends Command {
     @ApiModelProperty(value = "GBS用户id", name = "id", required = true)
-    @NotEmpty(message = "GBS用户id不能为空")
+    @NotNull(message = "GBS用户id不能为空")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(value = "用户id", name = "userId", required = true)
     @NotEmpty(message = "用户id不能为空")
     private String userId;
@@ -37,17 +38,17 @@ public class SysUserUpdateCmd extends Command {
     @NotEmpty(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "企业", name = "corpinfoId", required = true)
-    @NotEmpty(message = "企业不能为空")
+    @NotNull(message = "企业不能为空")
-    private String corpinfoId;
+    private Long corpinfoId;
     @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
-    @NotEmpty(message = "部门id不能为空")
+    @NotNull(message = "部门id不能为空")
-    private String departmentId;
+    private Long departmentId;
     @ApiModelProperty(value = "角色id", name = "roleIds", required = true)
     @NotEmpty(message = "角色id不能为空")
     private String roleIds;
     @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true)
     @NotEmpty(message = "1监管2企业3相关方不能为空")
-    private String userType;
+    private Integer userType;
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制", name = "status", required = true)
     @NotEmpty(message = "状态0.正常 99.锁定 2密码错误次数超过当天限制不能为空")
     private String status;

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -51,13 +52,13 @@ public class CorpInfoCO extends ClientObject {
     private String companyArea;
     //开始服务日期
     @ApiModelProperty(value = "开始服务日期")
-    private String firstServeDate;
+    private LocalDate firstServeDate;
     //规模
     @ApiModelProperty(value = "规模")
     private String scale;
     //成立时间
     @ApiModelProperty(value = "成立时间")
-    private LocalDateTime createDate;
+    private LocalDate createDate;
     //企业状态
     @ApiModelProperty(value = "企业状态")
     private String corpState;
@@ -190,6 +191,11 @@ public class CorpInfoCO extends ClientObject {
     //四色图类型，1.平面四色图
     @ApiModelProperty(value = "四色图类型，1.平面四色图")
     private String fourtype;
+    @ApiModelProperty(value = "营业执照开始时间")
+    private LocalDate licenseStart;
+    //营业执照结束时间
+    @ApiModelProperty(value = "营业执照结束时间")
+    private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,2:否
     @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
     private Integer whetherHygiene;

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

@@ -17,7 +17,7 @@ import java.util.Date;
 public class SysUserCO extends ClientObject {
     //GBS用户id
     @ApiModelProperty(value = "GBS用户id")
-    private Integer id;
+    private Long id;
     //用户id
     @ApiModelProperty(value = "用户id")
     private String userId;
@@ -32,16 +32,16 @@ public class SysUserCO extends ClientObject {
     private String name;
     //企业
     @ApiModelProperty(value = "企业")
-    private String corpinfoId;
+    private Long corpinfoId;
     //部门id
     @ApiModelProperty(value = "部门id")
-    private String departmentId;
+    private Long departmentId;
     //角色id
     @ApiModelProperty(value = "角色id")
     private String roleIds;
     //1监管2企业3相关方
     @ApiModelProperty(value = "1监管2企业3相关方")
-    private String userType;
+    private Integer userType;
     //状态0.正常 99.锁定 2密码错误次数超过当天限制
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制")
     private String status;

web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoGateway.java

@@ -13,7 +13,7 @@ public interface CorpInfoGateway {
     /**
      * 新增
      */
-    Boolean add(CorpInfoE corpInfoE);
+    Long add(CorpInfoE corpInfoE);
 
     /**
      * 修改

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -42,11 +43,11 @@ public class CorpInfoE extends BaseE {
     //所属区域
     private String companyArea;
     //开始服务日期
-    private String firstServeDate;
+    private LocalDate firstServeDate;
     //规模
     private String scale;
     //成立时间
-    private LocalDateTime createDate;
+    private LocalDate createDate;
     //企业状态
     private String corpState;
     //企业状态编码
@@ -135,6 +136,10 @@ public class CorpInfoE extends BaseE {
     private String subordinationName;
     //四色图类型，1.平面四色图
     private String fourtype;
+    //营业执照开始时间
+    private LocalDate licenseStart;
+    //营业执照结束时间
+    private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,2:否
     private Integer whetherHygiene;
     //有无重大危险源,1:是,2:否

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

@@ -28,13 +28,13 @@ public class SysUserE extends BaseE {
     //姓名
     private String name;
     //企业
-    private String corpinfoId;
+    private Long corpinfoId;
     //部门id
-    private String departmentId;
+    private Long departmentId;
     //角色id
     private String roleIds;
     //1监管2企业3相关方
-    private String userType;
+    private Integer userType;
     //状态0.正常 99.锁定 2密码错误次数超过当天限制
     private String status;
     //邮箱

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java

@@ -22,11 +22,11 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway {
     private final CorpInfoRepository corpInfoRepository;
 
     @Override
-    public Boolean add(CorpInfoE corpInfoE) {
+    public Long add(CorpInfoE corpInfoE) {
         CorpInfoDO d = new CorpInfoDO();
         BeanUtils.copyProperties(corpInfoE, d);
         corpInfoRepository.save(d);
-        return true;
+        return d.getId();
     }
 
     @Override

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -57,13 +58,13 @@ public class CorpInfoDO extends BaseDO {
     private String companyArea;
     //开始服务日期
     @ApiModelProperty(value = "开始服务日期")
-    private String firstServeDate;
+    private LocalDate firstServeDate;
     //规模
     @ApiModelProperty(value = "规模")
     private String scale;
     //成立时间
     @ApiModelProperty(value = "成立时间")
-    private LocalDateTime createDate;
+    private LocalDate createDate;
     //企业状态
     @ApiModelProperty(value = "企业状态")
     private String corpState;
@@ -196,6 +197,12 @@ public class CorpInfoDO extends BaseDO {
     //四色图类型，1.平面四色图
     @ApiModelProperty(value = "四色图类型，1.平面四色图")
     private String fourtype;
+    //营业执照开始时间
+    @ApiModelProperty(value = "营业执照开始时间")
+    private LocalDate licenseStart;
+    //营业执照结束时间
+    @ApiModelProperty(value = "营业执照结束时间")
+    private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,2:否
     @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
     private Integer whetherHygiene;

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

@@ -37,16 +37,16 @@ public class SysUserDO extends BaseDO {
     private String name;
     //企业
     @ApiModelProperty(value = "企业")
-    private String corpinfoId;
+    private Long corpinfoId;
     //部门id
     @ApiModelProperty(value = "部门id")
-    private String departmentId;
+    private Long departmentId;
     //角色id
     @ApiModelProperty(value = "角色id")
     private String roleIds;
     //1监管2企业3相关方
     @ApiModelProperty(value = "1监管2企业3相关方")
-    private String userType;
+    private Integer userType;
     //状态0.正常 99.锁定 2密码错误次数超过当天限制
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制")
     private String status;