需求回归

jwtech-admin-page/src/layout/components/Navbar.vue

@@ -138,7 +138,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <div class="funList2">
+      <div class="funList2"  v-hasPermi="['index:service:screen']" >
         <el-tooltip
           class="item"
           effect="dark"

jwtech-admin-page/src/layout/components/Sidebar/Logo.vue

@@ -50,7 +50,7 @@ export default {
       // title: "智慧水利水工程应用",
       // title: '安全知识图谱管理平台',
       // logo: logoImg,
-      title: "水利工程建设管理",
+      title: "水利工程建设管理模块",
       logo: logo,
     };
   },

jwtech-admin-page/src/views/home/components/businessOverview.vue

@@ -5,7 +5,7 @@
             <span>业务总览</span>
         </div>
         <div class="business-main">
-            <span class="main-title">水工程建设管理</span>
+            <span class="main-title">水工程建设管理模块</span>
             <div class="manage-list">
                 <div class="list-item" v-for="(item, index) in manageList" :key="(item, index)">
                     <div class="item-title">
@@ -170,4 +170,4 @@ export default {
             }
         }
     }
-}</style>
+}</style>

jwtech-admin/pom.xml

@@ -34,6 +34,8 @@
             <version>1.12</version>
         </dependency>
 
+
+
         <!--<dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>

jwtech-h5-page/config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://175.178.86.109:18082/tianhui-admin-web',
+  baseUrl: 'http://localhost:18082/tianhui-admin-web',
   // 应用信息
   appInfo: {
     // 应用名称

jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="descriptions-table">
+    <div v-if="hasValidData">
     <div
       class="table-item"
       v-for="(item, index) in allPersonType"
       :key="(item, index)"
+      v-if="item.personTypeData && item.personTypeData.length > 0"
     >
       <span
         style="font-size: 16px; font-weight: 700;margin-bottom: 10px;display: block;"
@@ -31,6 +33,8 @@
         </el-table-column>
       </el-table>
     </div>
+    </div>
+    <div v-else>暂无数据</div>
   </div>
 </template>
 <script>
@@ -64,36 +68,33 @@ export default {
   },
   mounted() {
     this.getDicts("personnel_type").then(res => {
+      this.allPersonType = [];
       this.personList = res.data.data;
-      let obj = {};
-      let obj1 = {};
-      let obj2 = {};
       res.data.data.forEach(item => {
-        if (item.dictValue == "0") {
-          obj = {
+        let obj = {};
+        obj = {
             personTypeLabel: item.dictLabel,
             personTypeValue: item.dictValue,
             personTypeData: []
           };
-        } else if (item.dictValue == "1") {
-          obj1 = {
-            personTypeLabel: item.dictLabel,
-            personTypeValue: item.dictValue,
-            personTypeData: []
-          };
-        } else if (item.dictValue !== "0" && item.dictValue !== "1") {
-          obj2 = {
-            personTypeLabel: "其它有职称人员",
-            personTypeValue: "",
-            personTypeData: []
-          };
-        }
+         this.allPersonType.push(obj)
       });
-      this.allPersonType = [obj, obj1, obj2];
+
     });
     this.enterpriseId = this.$route.query.enterpriseId;
     this.getPersonInfo();
   },
+  computed: {
+    hasValidData() {
+      // 遍历 allPersonType 数组，检查是否有非空的 personTypeData
+      for (let i = 0; i < this.allPersonType.length; i++) {
+        if (this.allPersonType[i].personTypeData && this.allPersonType[i].personTypeData.length > 0) {
+          return true;
+        }
+      }
+      return false;
+    }
+  },
   methods: {
     certificateLevelFormatter(row) {
       let res = "";

jwtech-pc-page/src/views/enterpriseInformation/components/proAchievementTable.vue

@@ -24,10 +24,14 @@
       </el-form-item>
     </el-form>
     <el-table :data="tableData" style="width: 100%" v-loading="loading">
+      <el-table-column
+        prop="enterpriseName"
+        label="企业名称"
+        align="center"
+      />
       <el-table-column
         prop="projectName"
         label="项目名称"
-        width="250"
         align="center"
       >
       </el-table-column>

jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue

@@ -1,22 +1,24 @@
 <template>
   <div class="descriptions-table">
-    <el-descriptions
-      class="margin-top"
-      :column="1"
-      border
-      :content-style="rowCenter"
-      :label-style="labelRowCenter"
-      v-for="(item, index) in certificationData"
-      :key="(item, index)"
-    >
-      <el-descriptions-item
-        :label="itemTable.label"
-        v-for="(itemTable, indexTable) in item"
-        :key="(itemTable, indexTable)"
-      >
-        {{ itemTable.val }}
-      </el-descriptions-item>
-    </el-descriptions>
+    <el-table :data="dataList" border style="width: 100%">
+      <el-table-column prop="enterpriseName" label="企业名称" width="200">
+      </el-table-column>
+      <el-table-column prop="qualificationCategory" label="资质类别" width="180">
+      </el-table-column>
+      <el-table-column prop="professionalCategory" label="资质专业类别" width="150">
+      </el-table-column>
+
+      <el-table-column prop="level" label="资质等级名称" width="200">
+      </el-table-column>
+      <el-table-column prop="certificateNo" label="资质证书号" width="280">
+      </el-table-column>
+      <el-table-column prop="issuedBy" label="资质证书核发机关"  width="200">
+      </el-table-column>
+      <el-table-column prop="issuanceDate" label="资质证书核发日期"  width="200">
+      </el-table-column>
+      <el-table-column prop="validityPeriod" label="有效到期日期"  width="200">
+      </el-table-column>
+    </el-table>
     <div v-if="certificationData.length == 0">
       暂无子资质数据~
     </div>
@@ -28,6 +30,7 @@ import { listByEid } from "@/api/enterpriseInformation";
 export default {
   data() {
     return {
+      dataList:[],
       rowCenter: {
         borderColor: "#DADCE3"
       },
@@ -51,6 +54,7 @@ export default {
       listByEid(this.enterpriseId).then(res => {
         if (res.data.data.length > 0) {
           let dataList = [];
+          this.dataList=dataList
           res.data.data.forEach(item => {
             if (item.children && item.children.length > 0) {
               dataList.push(...item.children);

jwtech-system/pom.xml

@@ -40,11 +40,7 @@
         </dependency>
 
         <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.11</version>
-        </dependency>
+
 
 
 

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -47,7 +47,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageSize") int pageSize,
                                            @Param("proNo") String proNo,
                                            @Param("proCode")String proCode,
-                                           @Param("isMajor")String isMajor);
+                                           @Param("isMajor")String isMajor,
+                                           @Param("projectType")String projectType);
 
     List<BsSgcjsjdBuiProInfo> getCompleteByUserPro(@Param("userId") String userId,
                                            @Param("userType") String userType,
@@ -79,7 +80,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                               @Param("orderBy") String orderBy,
                                               @Param("proNo") String proNo,
                                               @Param("proCode")String proCode,
-                                              @Param("isMajor")String isMajor);
+                                              @Param("isMajor")String isMajor,
+                                              @Param("projectType")String projectType);
 
     IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("userId") String userId,
                                                 @Param("userType") String userType,

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -160,6 +160,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 isMajor = "ms";
             }
         }
+        String major = sp.getData().getIsMajor();
+        String projectType = sp.getData().getProjectType();
+        if (StringUtils.isNotEmpty(major)){
+            isMajor=major;
+        }
+
 
         //显示项目法人绑定主项目
         if (sysUser.getUserType().equals("01")){
@@ -167,15 +173,21 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     "create_time", sp.getPageNum(), sp.getPageSize(), sp.getData().getProNo(), null,sysUser.getId());
             List<BsSgcjsjdBuiProInfo>bsSgcjsjdBuiProInfos=bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     null,
-                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor);
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor,sp.getData().getProjectType());
             List<BsSgcjsjdBuiProInfo>bsSgcjsjdBuiProInfoList=new ArrayList<>();
             if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiSectionInfos)){
                 String firstNo=null;
             for (BsSgcJsjdBuiSectionInfo bs:bsSgcJsjdBuiSectionInfos){
                 if (bs.getProNo().equals(firstNo)) continue;
                 firstNo=bs.getProNo();
-                BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo=bsSgcjsjdBuiProInfoMapper.selectOne(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class)
-                        .eq(BsSgcjsjdBuiProInfo::getProNo,bs.getProNo()));
+                LambdaQueryWrapper<BsSgcjsjdBuiProInfo> wrapper = Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class)
+                        .eq(BsSgcjsjdBuiProInfo::getProNo, bs.getProNo());
+                if (StringUtils.isNotEmpty(major)){
+                    wrapper.eq(BsSgcjsjdBuiProInfo::getIsMajor,major);
+                    wrapper.eq(BsSgcjsjdBuiProInfo::getProjectType,projectType);
+                }
+                BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo=bsSgcjsjdBuiProInfoMapper.selectOne(wrapper);
+
                     String proNo = bsSgcjsjdBuiProInfo.getProNo();
                     QueryWrapper<BsSgcJsjdBuiContInfo>queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("pro_no", proNo);
@@ -244,24 +256,28 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     }
                     bsSgcjsjdBuiProInfoMapper.updateById(bsSgcjsjdBuiProInfo);
                 }
+                if (!bsSgcjsjdBuiProInfoList.contains(bsSgcjsjdBuiProInfo)){
+                    bsSgcjsjdBuiProInfoList.add(bsSgcjsjdBuiProInfo);
+                }
             }
             Page<BsSgcjsjdBuiProInfo> page = new Page<>();
             page.setRecords(bsSgcjsjdBuiProInfoList);
             return page;
-}
+        }
 
+        //管理员显示项目
         if (ObjectUtil.isNull(params)) {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),
-                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor);
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor,sp.getData().getProjectType());
         } else {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(),
-                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor);
+                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor,sp.getData().getProjectType());
         }
 
         List<BsSgcjsjdBuiProInfo>bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.getCount(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                 sysXzqhService.getSubString(data.getAdcd()),
-                "create_time", sp.getData().getProNo(),null,isMajor);
+                "create_time", sp.getData().getProNo(),null,isMajor,sp.getData().getProjectType());
 
         Page<BsSgcjsjdBuiProInfo> page = new Page<>();
         page.setRecords(list);
@@ -551,7 +567,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         String xzqhId = sysDept.getXzqhId();
         List<BsSgcjsjdBuiProInfo> records= bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), null, null,
                 sysXzqhService.getSubString(xzqhId),
-                "create_time", 1,Integer.MAX_VALUE,null,null,null);
+                "create_time", 1,Integer.MAX_VALUE,null,null,null,null);
         if (CollectionUtil.isEmpty(records)){
             return new HashMap<>();
         }
@@ -913,7 +929,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         sp.setPageSize(99999);
         List<BsSgcjsjdBuiProInfo> records= bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                 sysXzqhService.getSubString(data.getAdcd()),
-                "create_time", 1,Integer.MAX_VALUE,sp.getData().getProNo(),null,null);
+                "create_time", 1,Integer.MAX_VALUE,sp.getData().getProNo(),null,null,null);
         if (CollectionUtil.isEmpty(records)){
             return new HashMap<>();
         }
@@ -969,7 +985,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         String xzqhId = sysDept.getXzqhId();
         List<BsSgcjsjdBuiProInfo> records= bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), null, sp.getData().getProjectName(),
                 sysXzqhService.getSubString(xzqhId),
-                "create_time", sp.getPageNum(),sp.getPageSize(),null,null,null);
+                "create_time", sp.getPageNum(),sp.getPageSize(),null,null,null,null);
         List<BsInfoDto>list =new ArrayList<>();
         if (CollectionUtil.isEmpty(records)){
             return new Page<>();
@@ -1015,7 +1031,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
             }
             list.add(bsInfoDto);
         }
-        List<BsSgcjsjdBuiProInfo> count = bsSgcjsjdBuiProInfoMapper.getCount(null, sysUser.getUserType(), null, sp.getData().getProjectName(), sysXzqhService.getSubString(xzqhId), "create_time", null, null, null);
+        List<BsSgcjsjdBuiProInfo> count = bsSgcjsjdBuiProInfoMapper.getCount(null, sysUser.getUserType(), null, sp.getData().getProjectName(), sysXzqhService.getSubString(xzqhId), "create_time", null, null, null,null);
         Page<BsInfoDto>page=new Page<>(sp.getPageNum(),sp.getPageSize());
         page.setRecords(list);
         page.setTotal(count.size());
@@ -1030,7 +1046,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
             String xzqhId = sysDept.getXzqhId();
         List<BsSgcjsjdBuiProInfo> records= bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), null, null,
                 sysXzqhService.getSubString(xzqhId),
-                "create_time", 1,Integer.MAX_VALUE,null,null,null);
+                "create_time", 1,Integer.MAX_VALUE,null,null,null,null);
 
         HashMap<String,Integer>map=new HashMap<>();
         map.put("forewarning",0);
@@ -1074,7 +1090,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         String xzqhId = sysDept.getXzqhId();
         List<BsSgcjsjdBuiProInfo> records= bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), null, null,
                 sysXzqhService.getSubString(xzqhId),
-                "create_time", 1,Integer.MAX_VALUE,null,null,null);
+                "create_time", 1,Integer.MAX_VALUE,null,null,null,null);
         if (CollectionUtil.isEmpty(records)){
             return new HashMap<>();
         }

jwtech-system/src/main/java/com/kms/statistics/service/BzjAssertStatisService.java

@@ -72,14 +72,14 @@ public class BzjAssertStatisService {
         if (ObjectUtil.isNull(params)) {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),
-                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor);
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor,null);
         } else {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(),
-                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor);
+                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor,null);
         }
         List<BsSgcjsjdBuiProInfo> bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.getCount(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                 sysXzqhService.getSubString(data.getAdcd()),
-                "create_time", sp.getData().getProNo(),sp.getData().getProCode(),isMajor);
+                "create_time", sp.getData().getProNo(),sp.getData().getProCode(),isMajor,null);
 
         List<BzjAssertStatisticsVo>bzjAssertStatisticsVoss=new ArrayList<>();
        if (CollectionUtil.isNotEmpty(list)){

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -184,6 +184,9 @@
                 <if test="isMajor != null and isMajor != ''">
                     and pi.IS_MAJOR=#{isMajor}
                 </if>
+                <if test="projectType != null and projectType != ''">
+                    and pi.project_type=#{projectType}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
@@ -202,6 +205,9 @@
                 <if test="isMajor != null and isMajor != ''">
                     and pi.IS_MAJOR=#{isMajor}
                 </if>
+                <if test="projectType != null and projectType != ''">
+                    and pi.project_type=#{projectType}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml

@@ -262,5 +262,83 @@
                 AND bind_status = #{bindStatus}
             </if>
         </where>
+
+        UNION
+        SELECT *,'计划管理' as source
+        FROM (
+        SELECT DISTINCT
+        bsqpi.pro_no,
+        bsqpi.PLAN_NAME,
+        bsqpi.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = bsqpi.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
+        FROM
+        bs_slgc_qqjd_plan_info bsqpi
+        <where>
+            1 = 1
+            <if test="projectName != null and projectName != ''">
+                AND bsqpi.PLAN_NAME LIKE CONCAT('%', #{projectName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and bsqpi.adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY
+        bsqpi.pro_no, bsqpi.PLAN_NAME, bsqpi.adcd
+        ) AS subquery
+        <where>
+            1 = 1
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
+            </if>
+        </where>
+
+        UNION
+        SELECT *,'专题管理' as source
+        FROM (
+        SELECT DISTINCT
+        bsqspi.pro_no,
+        bsqspi.PROJECT_NAME,
+        bsqspi.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = bsqspi.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
+        FROM
+        bs_slgc_qqjd_spe_pro_info bsqspi
+        <where>
+            1 = 1
+            <if test="projectName != null and projectName != ''">
+                AND bsqspi.PROJECT_NAME LIKE CONCAT('%', #{projectName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and bsqspi.adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY
+        bsqspi.pro_no, bsqspi.PROJECT_NAME, bsqspi.adcd
+        ) AS subquery
+        <where>
+            1 = 1
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
+            </if>
+        </where>
     </select>
 </mapper>