20241213 付费码管理

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/AuditTaskDTO.java

@@ -6,6 +6,6 @@ import java.util.List;
 
 @Data
 public class AuditTaskDTO {
-    private List<Integer> taskIds;
+    private List<Integer> ids;
     private Integer result;
 }

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/QueryAuditTaskDTO.java

@@ -8,4 +8,6 @@ public class QueryAuditTaskDTO {
    private  Integer type;
    private Integer auditResult;
    private Integer tenantId;
+   private Long size;
+   private Long current;
 }

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/businessTask/QueryAuditTaskVO.java

@@ -7,8 +7,9 @@ import java.util.Date;
 
 @Data
 public class QueryAuditTaskVO {
-   private Integer departMentId;
-   private String  departMentName;
+    private Integer id;
+   private Integer departmentId;
+   private String  departmentName;
    private Integer positionId;
    private String  positionName;
    private String personnelName;
@@ -24,4 +25,6 @@ public class QueryAuditTaskVO {
    private Integer createId;
    private String createName;
    private Integer type;
+    private String versionName;
+    private String versionNum;
 }

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/CompanyPersonSignUpDTO.java

@@ -5,14 +5,14 @@ import lombok.Data;
 
 @Data
 public class CompanyPersonSignUpDTO {
-   private String enterpriseCode;
-   private Integer departMentId;
-   private Integer positionId;
-   private String personnelName;
-   private String  personnelPhone;
-   private String personnelEmail;
-   private String personnelUserName;
-    private String  personnelPassword;
+    private String enterpriseCode;
+    private Integer departMentId;
+    private Integer positionId;
+    private String personnelName;
+    private String personnelPhone;
+    private String personnelEmail;
+    private String personnelUserName;
+    private String personnelPassword;
     private String phoneCode;
-    private String  vipTypeId;
+    private Integer vipTypeId;
 }

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/UpdateQiaoBiTenantDTO.java

@@ -10,7 +10,7 @@ public class UpdateQiaoBiTenantDTO {
     private Integer tenantId;
     private String name;
     private String describe;
-    private String number;
+    private Integer number;
     private Integer state;
     private String type;
     private String address;

PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/version/BusinessTaskVersionVO.java

@@ -0,0 +1,52 @@
+package cn.cslg.permission.common.model.qiaobi.version;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 版本
+ *
+ * @Author xiexiang
+ * @Date 2024/11/19
+ */
+@Data
+public class BusinessTaskVersionVO  {
+    private Integer id;
+    private Integer businessTaskId;
+    /**
+     * 版本名称
+     */
+    private String versionName;
+    /**
+     * 版本号
+     */
+    private String versionNum;
+    private Integer versionId;
+    /**
+     * 版本文件
+     */
+    private String fileGuid;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 应用唯一标识符
+     */
+    private String applicationCode;
+    private Integer status;
+    /**
+     * 创建人
+     */
+    private Integer createId;
+
+    private Date createTime;
+    private Date publishTime;
+
+}

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/BusinessTaskController.java

@@ -35,8 +35,8 @@ public class BusinessTaskController {
     @Operation(summary = "查询审核任务")
     @PostMapping("/queryAuditTask")
     public String queryAuditTask(@RequestBody QueryAuditTaskDTO queryAuditTaskDTO) {
-        List<QueryAuditTaskVO> queryAuditTaskDTOList = businessTaskService.queryAuditTask(queryAuditTaskDTO);
-        return Response.success(queryAuditTaskDTOList);
+       Records records = businessTaskService.queryAuditTask(queryAuditTaskDTO);
+        return Response.success(records);
     }
 
     @Operation(summary = "审核任务")

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/PaidCodeController.java

@@ -66,6 +66,7 @@ public class PaidCodeController {
         Records records = paidCodeService.queryPaidCodeList(paidCodeQueryDTO);
         return Response.success(records);
     }
+
     @Operation(summary = "根据付费码发送手机验证码")
     @PostMapping("/sendPhoneCode")
     public String sendPhoneCode(@RequestBody SendCodeDTO sendCodeDTO) {
@@ -73,6 +74,7 @@ public class PaidCodeController {
         return Response.success(result);
     }
 
+
     @Operation(summary = "验证付费码")
     @PostMapping("/checkPhoneCode")
     public String checkPhoneCode(@RequestBody CheckPaidCodePhoneCodeDTO checkPaidCodePhoneCodeDTO) {

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/AssoBusinessTaskRegistInfo.java

@@ -0,0 +1,24 @@
+package cn.cslg.permission.domain.qiaobi;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * @TableName ASSO_BUSINESS_TASK_REGIST_INFO
+ */
+@TableName(value ="ASSO_BUSINESS_TASK_REGIST_INFO")
+@Data
+public class AssoBusinessTaskRegistInfo extends Model<AssoPaidCodeRegistInfo> {
+    private Integer id;
+
+    private Integer registInfoId;
+
+    private Integer businessTaskId;
+
+}

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/AssoBusinessTaskVersion.java

@@ -0,0 +1,24 @@
+package cn.cslg.permission.domain.qiaobi;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * @TableName ASSO_BUSINESS_TASK_VERSION
+ */
+@TableName(value ="ASSO_BUSINESS_TASK_VERSION")
+@Data
+public class AssoBusinessTaskVersion extends Model<AssoBusinessTaskVersion> {
+    private Integer id;
+
+    private Integer businessTaskId;
+
+    private Integer versionId;
+
+}

PCS/src/main/java/cn/cslg/permission/domain/qiaobi/BusinessTask.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,7 +14,7 @@ import lombok.Data;
 /**
  * @TableName BUSINESS_TASK
  */
-@TableName(value ="BUSINESS_TASK")
+@TableName(value = "BUSINESS_TASK")
 @Data
 public class BusinessTask extends Model<BusinessTask> {
     private Integer id;
@@ -28,7 +29,6 @@ public class BusinessTask extends Model<BusinessTask> {
     private Integer result;
 
     private Integer createId;
-
     private Integer status;
     private Integer tenantId;
 

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AssoBusinessTaskRegistInfoMapper.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.mapper.qiaobi;
+
+import cn.cslg.permission.domain.qiaobi.AssoBusinessTaskRegistInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author admin
+* @description 针对表【ASSO_BUSINESS_TASK_REGIST_INFO】的数据库操作Mapper
+* @createDate 2024-12-17 17:55:39
+* @Entity generator.domain.AssoBusinessTaskRegistInfo
+*/
+public interface AssoBusinessTaskRegistInfoMapper extends BaseMapper<AssoBusinessTaskRegistInfo> {
+
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AssoBusinessTaskVersionMapper.java

@@ -0,0 +1,22 @@
+package cn.cslg.permission.mapper.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.version.BusinessTaskVersionVO;
+import cn.cslg.permission.domain.Version;
+import cn.cslg.permission.domain.qiaobi.AssoBusinessTaskVersion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+* @author admin
+* @description 针对表【ASSO_BUSINESS_TASK_VERSION(审核任务和版本关联表)】的数据库操作Mapper
+* @createDate 2024-12-17 20:31:15
+* @Entity generator.domain.AssoBusinessTaskVersion
+*/
+public interface AssoBusinessTaskVersionMapper extends BaseMapper<AssoBusinessTaskVersion> {
+ public List<BusinessTaskVersionVO> queryVersionByTaskIds(List<Integer>taskIds);
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/BusinessTaskMapper.java

@@ -16,6 +16,8 @@ import java.util.List;
 public interface BusinessTaskMapper extends BaseMapper<BusinessTask> {
 
     public List<QueryAuditTaskVO> queryAuditTask(QueryAuditTaskDTO queryAuditTaskDTO);
+    public  Long queryAuditTaskTotal(QueryAuditTaskDTO queryAuditTaskDTO);
+
 }
 
 

PCS/src/main/java/cn/cslg/permission/service/RoleService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,8 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
     private final TenantService tenantService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
+    @Value("${ApplicationCode}")
+    private String ApplicationCode;
 
     @Transactional(rollbackFor = Exception.class)
     public void addRole(RoleVO roleVO) {
@@ -232,9 +235,10 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
             return roleList;
         }
         LambdaQueryWrapper<Role> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.eq(Role::getId, roleIds);
+        queryWrapper1.in(Role::getId, roleIds);
         if (applicationCode != null) {
-            queryWrapper1.eq(Role::getApplicationCode, applicationCode);
+            queryWrapper1.and(i -> i.eq(Role::getApplicationCode, applicationCode).or().isNull(Role::getApplicationCode));
+
         }
         roleList = this.list(queryWrapper1);
         return roleList;
@@ -244,7 +248,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
     public Integer checkLoginPersonRole() {
         Integer personId = loginUtils.getId();
         PersonnelVO personnelVO = cacheUtils.getLoginUser(personId);
-        List<Role> roleList = this.getRoleByPersonId(personId,null);
+        List<Role> roleList = this.getRoleByPersonId(personId, ApplicationCode);
         if (roleList == null || roleList.size() == 0) {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "无权限访问数据");
         }

PCS/src/main/java/cn/cslg/permission/service/VersionService.java

@@ -20,6 +20,7 @@ import cn.cslg.permission.mapper.VersionMapper;
 import cn.cslg.permission.service.outSideApi.FileManagerService;
 import cn.cslg.permission.service.qiaobi.AssoFunctionModuleService;
 import cn.cslg.permission.service.qiaobi.AssoVersionFunctionService;
+import cn.cslg.permission.service.qiaobi.BusinessTaskService;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -58,6 +59,7 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
     private final PersonnelService personnelService;
     private final FileManagerService fileManagerService;
     private final ApplicationService applicationService;
+    private final BusinessTaskService businessTaskService;
 
     /**
      * 新增
@@ -74,9 +76,14 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         if (version.getStatus() != null && version.getStatus().equals(3)) {
             version.setPublishTime(new Date());
         }
+
         version.setCreateId(loginUtils.getId());
         version.insert();
         Integer id = version.getId();
+        if (version.getStatus() != null && version.getStatus().equals(3)) {
+            version.setStatus(4);
+            businessTaskService.AddVersionBusinessTask(id);
+        }
         //保存版本和功能关联
         List<Integer> functionIds = codeDTOS.stream().map(AssoFunctionCodeDTO::getFunctionId).collect(Collectors.toList());
         assoVersionFunctionService.addAssoVersionFunctions(functionIds, version.getId());
@@ -94,6 +101,7 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         Integer personId = 1;
         Records records = new Records();
         Integer id = versionDTO.getId();
+        Integer status = versionDTO.getStatus();
         this.checkVersionStatus(id);
 
         Version version = this.getById(id);
@@ -108,6 +116,11 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         if (codeDTOS != null && codeDTOS.size() > 0) {
             functionIds = codeDTOS.stream().map(AssoFunctionCodeDTO::getFunctionId).collect(Collectors.toList());
         }
+
+        if (status != null && status.equals(3)) {
+            version.setStatus(4);
+            businessTaskService.AddVersionBusinessTask(id);
+        }
         assoVersionFunctionService.addAssoVersionFunctions(functionIds, version.getId());
         String versionNum = version.getVersionNum();
         assoFunctionModuleService.saveFunctionModuleBatch(codeDTOS, id, versionNum);
@@ -300,7 +313,9 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
 
         }
         if (status.equals(3)) {
-            version.setPublishTime(new Date());
+            status = 4;
+            businessTaskService.AddVersionBusinessTask(versionId);
+
         }
         version.setStatus(status);
         version.updateById();
@@ -322,4 +337,14 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         }
         return qiaoBiVersionVO;
     }
+
+
+    public Integer updateVersionStatusSys(VersionStatusDTO versionStatusDTO) {
+        Integer versionId = versionStatusDTO.getId();
+        Integer status = versionStatusDTO.getStatus();
+        Version version = this.getById(versionId);
+        version.setStatus(status);
+        version.updateById();
+        return version.getId();
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoBusinessTaskRegistInfoService.java

@@ -0,0 +1,25 @@
+package cn.cslg.permission.service.qiaobi;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.cslg.permission.domain.qiaobi.AssoBusinessTaskRegistInfo;
+import cn.cslg.permission.mapper.qiaobi.AssoBusinessTaskRegistInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author admin
+ * @description 针对表【ASSO_BUSINESS_TASK_REGIST_INFO】的数据库操作Service实现
+ * @createDate 2024-12-17 17:55:39
+ */
+@Service
+public class AssoBusinessTaskRegistInfoService extends ServiceImpl<AssoBusinessTaskRegistInfoMapper, AssoBusinessTaskRegistInfo> {
+    public void addAsso(Integer taskId, Integer registInfoId) {
+        AssoBusinessTaskRegistInfo assoBusinessTaskRegistInfo = new AssoBusinessTaskRegistInfo();
+        assoBusinessTaskRegistInfo.setBusinessTaskId(taskId);
+        assoBusinessTaskRegistInfo.setRegistInfoId(registInfoId);
+        assoBusinessTaskRegistInfo.insert();
+    }
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoBusinessTaskVersionService.java

@@ -0,0 +1,40 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.cslg.permission.domain.qiaobi.AssoBusinessTaskVersion;
+import cn.cslg.permission.mapper.qiaobi.AssoBusinessTaskVersionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author admin
+* @description 针对表【ASSO_BUSINESS_TASK_VERSION(审核任务和版本关联表)】的数据库操作Service实现
+* @createDate 2024-12-17 20:31:15
+*/
+@Service
+public class AssoBusinessTaskVersionService extends ServiceImpl<AssoBusinessTaskVersionMapper, AssoBusinessTaskVersion>{
+
+    public  void addAssoBusinessTaskVersion(Integer taskId,Integer versionId){
+        AssoBusinessTaskVersion assoBusinessTaskVersion =new AssoBusinessTaskVersion();
+        assoBusinessTaskVersion.setBusinessTaskId(taskId);
+        assoBusinessTaskVersion.setVersionId(versionId);
+        assoBusinessTaskVersion.insert();
+    }
+    public  Integer getVersionId(Integer taskId){
+        LambdaQueryWrapper<AssoBusinessTaskVersion> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoBusinessTaskVersion::getBusinessTaskId,taskId);
+        AssoBusinessTaskVersion assoBusinessTaskVersion =this.getOne(queryWrapper,false);
+        if(assoBusinessTaskVersion==null){
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR,"未查询到任务关联版本");
+        }
+        return assoBusinessTaskVersion.getVersionId();
+
+
+    }
+}
+
+
+
+

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoTenantVipTypeService.java

@@ -69,7 +69,7 @@ public class AssoTenantVipTypeService extends ServiceImpl<AssoTenantVipTypeMappe
         //添加版本代码
         this.saveAssos(assoTenantVipTypes);
         //更新版本代码
-        this.updateAssos(orgAssoTenantVipTypes);
+        this.updateAssos(updateAssoTenantVipTypes);
     }
 
 
@@ -95,6 +95,7 @@ public class AssoTenantVipTypeService extends ServiceImpl<AssoTenantVipTypeMappe
             assoTenantVipType.setTenantId(tenantId);
             assoTenantVipType.setVipTypeId(vipTypeNumDTO.getVipTypeId());
             assoTenantVipType.setVipTypeNum(vipTypeNumDTO.getVipTypeNum());
+            assoTenantVipTypes.add(assoTenantVipType);
         }
         return assoTenantVipTypes;
     }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/BusinessTaskService.java

@@ -1,27 +1,33 @@
 package cn.cslg.permission.service.qiaobi;
 
+import cn.cslg.permission.common.model.Records;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.businessTask.AuditTaskDTO;
 import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO;
 import cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskVO;
+import cn.cslg.permission.common.model.qiaobi.version.BusinessTaskVersionVO;
+import cn.cslg.permission.common.model.qiaobi.version.VersionStatusDTO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
+import cn.cslg.permission.common.model.vo.associate.AssoDepartPosVO;
+import cn.cslg.permission.common.utils.CacheUtils;
 import cn.cslg.permission.common.utils.LoginUtils;
 import cn.cslg.permission.domain.Department;
 import cn.cslg.permission.domain.Personnel;
 import cn.cslg.permission.domain.Position;
+import cn.cslg.permission.domain.Version;
 import cn.cslg.permission.domain.qiaobi.BusinessTask;
 import cn.cslg.permission.domain.qiaobi.RegistInformation;
 import cn.cslg.permission.exception.ExceptionEnum;
 import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.mapper.qiaobi.BusinessTaskMapper;
-import cn.cslg.permission.service.DepartmentService;
-import cn.cslg.permission.service.PersonnelService;
-import cn.cslg.permission.service.PositionService;
-import cn.cslg.permission.service.RoleService;
+import cn.cslg.permission.service.*;
+import cn.cslg.permission.service.associate.PerDpService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import jdk.internal.org.jline.utils.ShutdownHooks;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,19 +50,38 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
     private final RegistInformationService registInformationService;
     private final AssoPersonVipTypeService assoPersonVipTypeService;
     private final LoginUtils loginUtils;
+    private final CacheUtils cacheUtils;
+    private final AssoBusinessTaskVersionService assoBusinessTaskVersionService;
+    private final VersionService versionService;
+    private final PerDpService perDpService;
+    @Value("${ApplicationCode}")
+    private String ApplicationCode;
+
+    public Records queryAuditTask(QueryAuditTaskDTO queryAuditTaskDTO) {
+        Long current = queryAuditTaskDTO.getCurrent();
+        Long size = queryAuditTaskDTO.getSize();
+        Records records = new Records();
+        records.setCurrent(current);
+        if (current != null && size != null) {
+            queryAuditTaskDTO.setCurrent(((current - 1) * size));
+        }
 
-    public List<QueryAuditTaskVO> queryAuditTask(QueryAuditTaskDTO queryAuditTaskDTO) {
         Integer tenantId = roleService.checkLoginPersonRole();
         queryAuditTaskDTO.setTenantId(tenantId);
         List<QueryAuditTaskVO> queryAuditTaskVOS = this.getBaseMapper().queryAuditTask(queryAuditTaskDTO);
         this.loadQueryAuditTaskDTO(queryAuditTaskVOS);
-        return queryAuditTaskVOS;
+        Long total = this.getBaseMapper().queryAuditTaskTotal(queryAuditTaskDTO);
+        records.setRecords(queryAuditTaskVOS);
+        records.setTotal(total);
+        records.setSize(size);
+        return records;
     }
 
     private List<QueryAuditTaskVO> loadQueryAuditTaskDTO(List<QueryAuditTaskVO> queryAuditTaskVOS) {
         if (queryAuditTaskVOS == null || queryAuditTaskVOS.size() == 0) {
             return queryAuditTaskVOS;
         }
+        List<Integer> versionTaskIds = new ArrayList<>();
         List<Integer> personIds = new ArrayList<>();
         List<Personnel> personnelList = new ArrayList<>();
         List<Integer> departMentIds = new ArrayList<>();
@@ -67,8 +92,8 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
             if (item.getCreateId() != null) {
                 personIds.add(item.getCreateId());
             }
-            if (item.getDepartMentId() != null) {
-                departMentIds.add(item.getDepartMentId());
+            if (item.getDepartmentId() != null) {
+                departMentIds.add(item.getDepartmentId());
             }
             if (item.getHandleId() != null) {
                 personIds.add(item.getHandleId());
@@ -76,6 +101,9 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
             if (item.getPositionId() != null) {
                 positionIds.add(item.getPositionId());
             }
+            if (item.getType() != null && item.getType().equals(2)) {
+                versionTaskIds.add(item.getId());
+            }
         });
 
         if (personIds != null && personIds.size() > 0) {
@@ -88,6 +116,10 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
             positionList = positionService.getPositionByIds(positionIds);
         }
 
+        List<BusinessTaskVersionVO> businessTaskVersionVOS = new ArrayList<>();
+        if (versionTaskIds != null && versionTaskIds.size() > 0) {
+            businessTaskVersionVOS = assoBusinessTaskVersionService.getBaseMapper().queryVersionByTaskIds(versionTaskIds);
+        }
         for (QueryAuditTaskVO queryAuditTaskVO : queryAuditTaskVOS) {
             Personnel createUser = personnelList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getCreateId())).findFirst().orElse(null);
             if (createUser != null) {
@@ -97,14 +129,22 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
             if (handlerUser != null) {
                 queryAuditTaskVO.setHandleName(handlerUser.getPersonnelName());
             }
-            Department department = departmentList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getDepartMentId())).findFirst().orElse(null);
+            Department department = departmentList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getDepartmentId())).findFirst().orElse(null);
             if (department != null) {
-                queryAuditTaskVO.setDepartMentName(department.getDepartmentName());
+                queryAuditTaskVO.setDepartmentName(department.getDepartmentName());
             }
             Position position = positionList.stream().filter(item -> item.getId().equals(queryAuditTaskVO.getPositionId())).findFirst().orElse(null);
             if (position != null) {
                 queryAuditTaskVO.setPositionName(position.getPositionName());
             }
+            if (queryAuditTaskVO.getType() != null && queryAuditTaskVO.getType().equals(2)) {
+                BusinessTaskVersionVO businessTaskVersionVO = businessTaskVersionVOS.stream().filter(item -> item.getBusinessTaskId().equals(queryAuditTaskVO.getId())).findFirst().orElse(null);
+                if (businessTaskVersionVO != null) {
+                    businessTaskVersionVO.setVersionNum(businessTaskVersionVO.getVersionNum());
+                    businessTaskVersionVO.setVersionName(businessTaskVersionVO.getVersionName());
+                    businessTaskVersionVO.setVersionId(businessTaskVersionVO.getVersionId());
+                }
+            }
         }
         return queryAuditTaskVOS;
     }
@@ -118,7 +158,7 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
 
     @Transactional(rollbackFor = Exception.class)
     public void auditTasks(AuditTaskDTO auditTaskDTO) {
-        List<Integer> taskIds = auditTaskDTO.getTaskIds();
+        List<Integer> taskIds = auditTaskDTO.getIds();
         if (taskIds == null || taskIds.size() == 0) {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "请选择至少一个任务");
         }
@@ -164,9 +204,10 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
         businessTask.updateById();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void auditSignUpTaskPass(BusinessTask businessTask) {
         //查询人员注册信息
-        Integer taskId = businessTask.getTaskType();
+        Integer taskId = businessTask.getId();
         RegistInformation registInformation = registInformationService.getRegistInformationByTaskId(taskId);
         if (registInformation == null) {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "任务无注册信息");
@@ -174,6 +215,27 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
         Integer vipTypeId = registInformation.getVipTypeId();
         QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = this.transFormToQiaoBiPersonSignUpDTO(registInformation);
         qiaoBiPersonSignUpDTO = personnelService.addPhoneSignUpPerson(qiaoBiPersonSignUpDTO);
+
+        if (registInformation.getDepartMentId() != null || registInformation.getPositionId() != null) {
+            List<AssoDepartPosVO> assoDepartPoseVos = new ArrayList<>();
+            AssoDepartPosVO assoDepartPosVO = new AssoDepartPosVO();
+            assoDepartPosVO.setDepartment(registInformation.getDepartMentId());
+            if (registInformation.getDepartMentId() != null) {
+                Department department = departmentService.getById(registInformation.getDepartMentId());
+                if(department!=null){
+                    assoDepartPosVO.setDepartmentName(department.getDepartmentName());
+                }
+            }
+            assoDepartPosVO.setPosition(registInformation.getPositionId());
+            if(registInformation.getPositionId()!=null){
+                Position position = positionService.getById(registInformation.getDepartMentId());
+          if(position!=null){
+              assoDepartPosVO.setPositionName(position.getPositionName());
+          }
+            }
+            assoDepartPoseVos.add(assoDepartPosVO);
+            perDpService.addAssociatePerDp(assoDepartPoseVos, qiaoBiPersonSignUpDTO.getId());
+        }
         //绑定版本
         assoPersonVipTypeService.addVip(qiaoBiPersonSignUpDTO.getId(), vipTypeId, null);
         this.updateAuditTaskResult(businessTask, 1);
@@ -196,11 +258,23 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
     public void auditVersionTaskPass(BusinessTask businessTask) {
         roleService.checkApplicationRootRole("4e95e3d926a2a4befa5d913acc0bb8t6");
         this.updateAuditTaskResult(businessTask, 1);
+        VersionStatusDTO versionStatusDTO = new VersionStatusDTO();
+        versionStatusDTO.setStatus(3);
+        Integer versionId = assoBusinessTaskVersionService.getVersionId(businessTask.getId());
+        versionStatusDTO.setId(versionId);
+
+        versionService.updateVersionStatusSys(versionStatusDTO);
+
     }
 
     public void auditVersionTaskNotPass(BusinessTask businessTask) {
 
         this.updateAuditTaskResult(businessTask, 0);
+        VersionStatusDTO versionStatusDTO = new VersionStatusDTO();
+        versionStatusDTO.setStatus(4);
+        Integer versionId = assoBusinessTaskVersionService.getVersionId(businessTask.getId());
+        versionStatusDTO.setId(versionId);
+        versionService.updateVersionStatus(versionStatusDTO);
     }
 
     public QiaoBiPersonSignUpDTO transFormToQiaoBiPersonSignUpDTO(RegistInformation registInformation) {
@@ -213,6 +287,17 @@ public class BusinessTaskService extends ServiceImpl<BusinessTaskMapper, Busines
         return qiaoBiPersonSignUpDTO;
     }
 
+    public void AddVersionBusinessTask(Integer versionId) {
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        BusinessTask businessTask = new BusinessTask();
+        businessTask.setTaskType(2);
+        businessTask.setStatus(0);
+        businessTask.setTenantId(personnelVO.getTenantId());
+        businessTask.setCreateId(loginUtils.getId());
+        businessTask.insert();
+        assoBusinessTaskVersionService.addAssoBusinessTaskVersion(businessTask.getId(), versionId);
+    }
 }
 
 

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiPersonService.java

@@ -44,6 +44,9 @@ public class QiaoBiPersonService {
     private EnterpriseCodeService enterpriseCodeService;
     @Autowired
     private RegistInformationService registInformationService;
+    @Autowired
+    private AssoBusinessTaskRegistInfoService assoBusinessTaskRegistInfoService;
+
     @Transactional(rollbackFor = Exception.class)
     public QiaoBiPersonSignUpDTO personSignUp(QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
         String phoneNum = qiaoBiPersonSignUpDTO.getPhoneNum();
@@ -185,18 +188,22 @@ public class QiaoBiPersonService {
     @Transactional(rollbackFor = Exception.class)
     public void companyPersonSignUp(CompanyPersonSignUpDTO companyPersonSignUpDTO) {
         //企业码是否存在
-        Integer tenantId = enterpriseCodeService.getTenantIdByCode(companyPersonSignUpDTO.getEnterpriseCode());
         QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO = new QiaoBiPersonSignUpDTO();
         qiaoBiPersonSignUpDTO.setPhoneNum(companyPersonSignUpDTO.getPersonnelPhone());
+        qiaoBiPersonSignUpDTO.setPhoneCode(companyPersonSignUpDTO.getPhoneCode());
+        qiaoBiPersonSignUpDTO.setVipType(companyPersonSignUpDTO.getVipTypeId());
+        this.checkMessage(qiaoBiPersonSignUpDTO);
+        Integer tenantId = enterpriseCodeService.getTenantIdByCode(companyPersonSignUpDTO.getEnterpriseCode());
+        qiaoBiPersonSignUpDTO.setPhoneNum(companyPersonSignUpDTO.getPersonnelPhone());
         qiaoBiPersonSignUpDTO.setUsername(companyPersonSignUpDTO.getPersonnelUserName());
         qiaoBiPersonSignUpDTO.setEmail(companyPersonSignUpDTO.getPersonnelEmail());
         this.checkPersonInvalid(qiaoBiPersonSignUpDTO);
-      RegistInformation registInformation= registInformationService.addRegistInformation(companyPersonSignUpDTO);
-        BusinessTask businessTask =new BusinessTask();
+        RegistInformation registInformation = registInformationService.addRegistInformation(companyPersonSignUpDTO);
+        BusinessTask businessTask = new BusinessTask();
         businessTask.setTaskType(1);
         businessTask.setStatus(0);
         businessTask.setTenantId(tenantId);
         businessTask.insert();
-
+        assoBusinessTaskRegistInfoService.addAsso(businessTask.getId(),registInformation.getId());
     }
 }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiTenantService.java

@@ -68,6 +68,7 @@ public class QiaoBiTenantService {
         tenant.setTenantAddress(updateQiaoBiTenantDTO.getAddress());
         tenant.setTenantType(updateQiaoBiTenantDTO.getType());
         tenant.setTenantDescription(updateQiaoBiTenantDTO.getDescribe());
+        tenant.setTenantQuota(updateQiaoBiTenantDTO.getNumber());
         tenant.updateById();
         List<VipTypeNumDTO> vipTypeNumDTOS = updateQiaoBiTenantDTO.getVipTypes();
         assoTenantVipTypeService.saveFunctionModuleBatch(vipTypeNumDTOS,tenantId);

PCS/src/main/java/cn/cslg/permission/service/qiaobi/RegistInformationService.java

@@ -33,6 +33,7 @@ public class RegistInformationService extends ServiceImpl<RegistInformationMappe
     public RegistInformation addRegistInformation(CompanyPersonSignUpDTO companyPersonSignUpDTO) {
         RegistInformation registInformation = new RegistInformation();
         BeanUtils.copyProperties(companyPersonSignUpDTO, registInformation);
+        registInformation.setPersonnelUsername(companyPersonSignUpDTO.getPersonnelUserName());
         registInformation.insert();
         return registInformation;
     }

PCS/src/main/resources/application-prodNetIn.yml

@@ -50,4 +50,5 @@ inviteSignInLink: http://47.116.194.135:8078/register
 SMS:
   regionId: cn-shanghai
   accessKeyId: LTAI5tGyG1Q7fKprgg1nWhXj
-  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
+  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
+FMSUrl: http://192.168.2.24:8803

PCS/src/main/resources/application.yml

@@ -47,5 +47,5 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-
+ApplicationCode: 4e95e3d926a2a4befa5d913acc0bb8t6
 

PCS/src/main/resources/mapper/AssoBusinessTaskRegistInfoMapper.xml

@@ -0,0 +1,16 @@
+<?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="cn.cslg.permission.mapper.qiaobi.AssoBusinessTaskRegistInfoMapper">
+
+    <resultMap id="BaseResultMap" type="cn.cslg.permission.domain.qiaobi.AssoBusinessTaskRegistInfo">
+            <result property="id" column="ID" jdbcType="INTEGER"/>
+            <result property="registInfoId" column="REGIST_INFO_ID" jdbcType="INTEGER"/>
+            <result property="businessTaskId" column="BUSINESS_TASK_ID" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,REGIST_INFO_ID,BUSINESS_TASK_ID
+    </sql>
+</mapper>

PCS/src/main/resources/mapper/AssoBusinessTaskVersionMapper.xml

@@ -0,0 +1,19 @@
+<?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="cn.cslg.permission.mapper.qiaobi.AssoBusinessTaskVersionMapper">
+<select id="queryVersionByTaskIds" resultType="cn.cslg.permission.common.model.qiaobi.version.BusinessTaskVersionVO">
+    select v.* ,abtv.BUSINESS_TASK_ID as businessTaskId from ASSO_BUSINESS_TASK_VERSION abtv left join VERSION v on abtv.VERSION_ID = v.ID
+<where>
+    abtv. BUSINESS_TASK_ID in (
+    <foreach collection="taskIds" item="n" separator=",">
+        #{n}
+    </foreach>
+    )
+</where>
+
+
+</select>
+
+</mapper>

PCS/src/main/resources/mapper/BusinessTaskMapper.xml

@@ -6,19 +6,21 @@
 
 
 
-    <select id="queryAuditTask" resultType="cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskDTO">
+    <select id="queryAuditTask" resultType="cn.cslg.permission.common.model.qiaobi.businessTask.QueryAuditTaskVO">
         select bt.ID as id,
                bt.CREATE_TIME as createTime,
                bt.CREATE_ID as createId,
                bt.HANDLE_ID as handleId,
                bt.RESULT as auditResult,
                bt.STATUS as status,
-               bt.TYPE as type,
+               bt.TASK_TYPE as type,
                ri.DEPARTMENT_ID as departmentId,
                ri.POSITION_ID as positionId,
                ri.PERSONNEL_NAME as personnelName,
                ri.PERSONNEL_USERNAME as personnelUserName,
-               ri.PERSONNEL_PASSWORD as personnelPassword
+               ri.PERSONNEL_PASSWORD as personnelPassword,
+               ri.PERSONNEL_EMAIL as personnelEmail,
+               ri.PERSONNEL_PHONE as personnelPhone
         from BUSINESS_TASK bt left join ASSO_BUSINESS_TASK_REGIST_INFO abtri on bt.ID = abtri.BUSINESS_TASK_ID
         left join REGIST_INFORMATION ri on abtri.REGIST_INFO_ID=ri.ID
        <where>
@@ -32,5 +34,29 @@
                and    bt.RESULT=#{auditResult}
            </if>
        </where>
+        order by bt.CREATE_TIME desc
+        <if test="current!=null and size!=null">
+            limit #{current},#{size}
+        </if>
+    </select>
+    <select id="queryAuditTaskTotal" resultType="java.lang.Long">
+        select count(*)
+        from BUSINESS_TASK bt left join ASSO_BUSINESS_TASK_REGIST_INFO abtri on bt.ID = abtri.BUSINESS_TASK_ID
+        left join REGIST_INFORMATION ri on abtri.REGIST_INFO_ID=ri.ID
+        <where>
+            <if test="status!=null">
+                and   bt.STATUS=#{status}
+            </if>
+            <if test="type!=null">
+                and    bt.TYPE=#{type}
+            </if>
+            <if test="auditResult!=null">
+                and    bt.RESULT=#{auditResult}
+            </if>
+        </where>
+        order by bt.CREATE_TIME desc
+        <if test="current!=null and size!=null">
+            limit #{current},#{size}
+        </if>
     </select>
 </mapper>

PCS/src/main/resources/mapper/TenantMapper.xml

@@ -111,7 +111,7 @@
         )
     </if>
     <if test="name!=null and !name.trim().equals('')">
-    and    t.TENANT_NAME like concat('%', #{vipTypeName}, '%')
+    and    t.TENANT_NAME like concat('%', #{name}, '%')
     </if>
 </where>
         order by t.CREATE_TIME desc
@@ -134,7 +134,7 @@
                 )
             </if>
             <if test="name!=null and !name.trim().equals('')">
-                and    t.TENANT_NAME like concat('%', #{vipTypeName}, '%')
+                and    t.TENANT_NAME like concat('%', #{name}, '%')
             </if>
         </where>
 

PCS/src/test/java/cn/cslg/permission/qiaobi/QiaobiPersonTest.java

@@ -1,26 +1,40 @@
 package cn.cslg.permission.qiaobi;
 
+import cn.cslg.permission.common.core.business.LoginCacheKeyUtil;
 import cn.cslg.permission.common.model.qiaobi.tenant.CompanyPersonSignUpDTO;
+import cn.cslg.permission.common.utils.RedisUtil;
 import cn.cslg.permission.service.qiaobi.QiaoBiPersonService;
 import lombok.RequiredArgsConstructor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
-@RequiredArgsConstructor
 public class QiaobiPersonTest {
-private final QiaoBiPersonService qiaoBiPersonService;
+    @Autowired
+private  QiaoBiPersonService qiaoBiPersonService;
+    @Autowired
+private RedisUtil redisUtil;
 @Test
 public void CompanyPersonSignUp(){
+
     CompanyPersonSignUpDTO companyPersonSignUpDTO =new CompanyPersonSignUpDTO();
-    companyPersonSignUpDTO.setPersonnelEmail("2232623707@qq.com");
-    companyPersonSignUpDTO.setPersonnelPhone("17625547167");
+    companyPersonSignUpDTO.setPersonnelEmail("22326237071@qq.com");
+    companyPersonSignUpDTO.setPersonnelPhone("17625547161");
+    companyPersonSignUpDTO.setPhoneCode("ATEAT");
+     redisUtil.set(LoginCacheKeyUtil.getLoginCaptcha(companyPersonSignUpDTO.getPersonnelPhone()),"ATEAT");
+   companyPersonSignUpDTO.setDepartMentId(1);
+   companyPersonSignUpDTO.setPositionId(1);
+   companyPersonSignUpDTO.setPersonnelName("李仁杰");
+   companyPersonSignUpDTO.setPersonnelPassword("123456");
+   companyPersonSignUpDTO.setPersonnelUserName("lrj111");
+   companyPersonSignUpDTO.setVipTypeId(19);
+   companyPersonSignUpDTO.setEnterpriseCode("ABCD");
     qiaoBiPersonService.companyPersonSignUp(companyPersonSignUpDTO);
-
-
+    
 }
 }