From c2520f3f1dad675dbec2aa949c76d37954ecc344 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Tue, 26 Mar 2024 11:04:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/build/domain/BsSgcjsjdBuiProInfo.java | 2 ++ .../java/com/kms/common/api/CommonApi.java | 21 +++++++++++++++++-- .../domain/SpecialProjectPreDesign.java | 2 +- .../mapper/SpecialProjectPreDesignMapper.java | 2 +- .../SpecialProjectPreDesignService.java | 2 +- .../SpecialProjectPreDesignMapper.xml | 20 ++++++++---------- .../BsSgcYxjdEnterpriseInfoMapper.xml | 6 +++--- 7 files changed, 36 insertions(+), 19 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index 158abe64..dc260c93 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -250,4 +250,6 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @TableField(exist = false) private String projectPhase; + private String bindStatus; + } diff --git a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java index dae7e488..64ce2457 100644 --- a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java +++ b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java @@ -13,8 +13,11 @@ import com.jianwei.common.enums.BusinessType; import com.jianwei.common.utils.DictUtils; import com.jianwei.common.utils.FastDfsUtil; import com.jianwei.common.utils.file.FileUtils; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.service.BsSgcjsjdBuiProInfoService; import com.kms.common.entity.Chunk; import com.kms.common.utils.UserUtils; +import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; import com.kms.system.domain.SysUserEnterprise; import com.kms.system.domain.SysUserPro; import com.kms.system.service.SysRoleService; @@ -60,6 +63,9 @@ public class CommonApi { @Autowired private SysUserEnterpriseService sysUserEnterpriseService; + @Autowired + private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService; + // 文件路径 @Value("${jianwei.profile}") private String filePath; @@ -190,7 +196,7 @@ public class CommonApi { .map(x -> new SysUserPro(x, user.getId(), user.getId(), null,"0")) .collect(Collectors.toList()); - List list = sysUserProService.list(); + /*List list = sysUserProService.list(); List stringList = list.stream().map(x -> x.getProNo()).collect(Collectors.toList()); @@ -198,7 +204,14 @@ public class CommonApi { if (CollectionUtil.isNotEmpty(proList1)) { return AjaxResult.error("该项目已绑定，不可重复绑定！"); + }*/ + List list = new ArrayList<>(); + for (SysUserPro sysUserPro : proList) { + list.addAll(bsSgcjsjdBuiProInfoService.list(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class) + .eq(BsSgcjsjdBuiProInfo::getProNo, sysUserPro.getProNo()))); } + list.forEach(x->x.setBindStatus("1")); + bsSgcjsjdBuiProInfoService.updateBatchById(list); return AjaxResult.success(sysUserProService.saveBatch(proList)); @@ -214,7 +227,7 @@ public class CommonApi { .map(x -> new SysUserEnterprise(user.getId(),x, "1","0")) .collect(Collectors.toList()); - List list = sysUserEnterpriseService.list(); + /*List list = sysUserEnterpriseService.list(); List stringList = list.stream().map(SysUserEnterprise::getEnterpriseId).collect(Collectors.toList()); @@ -222,6 +235,10 @@ public class CommonApi { if (CollectionUtil.isNotEmpty(proList1)) { return AjaxResult.error("该企业已绑定，不可重复绑定！"); + }*/ + List infos = new ArrayList<>(); + for (String proNo : proNos) { + } return AjaxResult.success(sysUserEnterpriseService.saveBatch(proList)); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java index 0e0c2bfe..890c073d 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java @@ -100,6 +100,6 @@ public class SpecialProjectPreDesign extends BaseEntity @TableField(exist = false) - private String status; + private String bindStatus; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java index 00f62de1..dbc14133 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java @@ -36,6 +36,6 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper listProject(@Param("adcd") String subString, @Param("projectName") String projectName, - @Param("status") String status, + @Param("bindStatus") String bindStatus, Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index 774e24a4..48b5c2ca 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -73,7 +73,7 @@ public class SpecialProjectPreDesignService extends BaseService page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), - data.getStatus(), + data.getBindStatus(), new Page<>(sp.getPageNum(), sp.getPageSize())); diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 28b4b599..e2bcffcc 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -93,16 +93,14 @@ diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index b206171a..6e9f8ecc 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -116,7 +116,8 @@