Merge remote-tracking branch 'origin/master'

jwtech-admin-page/src/views/project/report/index.vue

@@ -13,7 +13,7 @@
     <el-row :gutter="20" v-show="showSearch">
       <el-col :span="22">
         <!-- 搜索条件 -->
-        <el-form :model="queryParams" :inline="true" label-width="68px">
+        <el-form :model="queryParams" :inline="true" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
               v-model="queryParams.data.projectName"
@@ -476,7 +476,7 @@
               /> -->
               <el-upload
                 class="upload-demo"
-                action="http://127.0.0.1/thinking/common/upload"
+                action="thinking/common/upload"
                 :headers="headers"
                 :on-preview="handleAttachmentPreview"
                 :on-remove="handleAttachmentRemove"

jwtech-admin-page/src/views/project/special/index.vue

@@ -480,7 +480,7 @@ export default {
     openOptions() {
       this.routeList.push({
         path: "/project/special/options",
-        routeName: "专题基础信息",
+        routeName: "专题基本信息",
         isEdit: false,
       });
       // 存储面包屑信息
@@ -588,7 +588,7 @@ export default {
       getProjectinfo(id).then((response) => {
         this.routeList.push({
           path: "/project/special/options",
-          routeName: "专题基础信息",
+          routeName: "专题基本信息",
           isEdit: true,
         });
 

jwtech-admin-page/src/views/project/special/options/basePage.vue

@@ -164,11 +164,11 @@
               :headers="headers"
               :on-preview="handlePreview"
               :on-remove="(file) => handleRemove(file, 'fileList1')"
-              :before-remove="beforeRemove"
               multiple
               :on-exceed="handleExceed"
               :on-success="(_, fileList) => submitUpload(fileList, 'fileList1')"
               :file-list="fileList1"
+              :before-upload="beforeUpload"
             >
               <el-button size="small" type="primary" plain>
                 <i class="el-icon-upload el-icon--right"></i>
@@ -450,9 +450,20 @@ export default {
         } 个文件`
       );
     },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
-    },
+    // 上传文件之前的钩子，参数为上传的文件
+    beforeUpload(file) {
+      let size = Number(file.size / 1024 / 1024);
+      if (size > 100) {
+          this.$message.warning("文件大小不能超过100MB");
+          return false;
+      }
+      // 检测上传文件格式
+      var type = file.name.substring(file.name.lastIndexOf(".") + 1);
+      if (['png', 'jpg', 'pdf', 'word', 'excel'].indexOf(type) === -1) {
+          this.$message.warning("请上传指定格式的文件!");
+          return false;
+      }
+        },
   },
 };
 </script>

jwtech-admin-page/src/views/project/special/options/documentPage.vue

@@ -302,7 +302,7 @@
           </el-descriptions-item>
 
           <el-descriptions-item span="2">
-            <template slot="label"> 可行性研究报告相关附件 </template>
+            <template slot="label"> 规划项目验收文档附件 </template>
             <template v-if="this.documentMsg.acceptDocumentAttachment">
               <div
                 v-for="(item, index) in JSON.parse(

jwtech-admin-page/src/views/project/special/options/resultsPage.vue

@@ -131,7 +131,8 @@
         label="评价内容"
         align="center"
         prop="evaluationContent"
-        min-width="180"
+        min-width="300"
+        :show-overflow-tooltip="true"
       />
 
       <el-table-column

jwtech-admin-page/src/views/project/special/options/taskPage.vue

@@ -139,12 +139,12 @@
         prop="projectName"
         min-width="180"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="项目编号"
         align="center"
         prop="proNo"
         min-width="180"
-      />
+      /> -->
       <el-table-column
         label="规划上报日期"
         align="center"
@@ -211,7 +211,8 @@
         label="批复意见"
         align="center"
         prop="replyOpinion"
-        min-width="180"
+        min-width="300"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="意见附件"

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

@@ -1,5 +1,7 @@
 package com.kms.build.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.build.domain.BsSgcJsjdBuiProgress;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -17,13 +19,12 @@ import java.util.List;
 @Repository
 public interface BsSgcJsjdBuiProgressMapper extends BaseMapper<BsSgcJsjdBuiProgress> {
 
-    List<BsSgcJsjdBuiProgress> getProgress(@Param("userId") String userId,
-                                           @Param("userType") String userType,
-                                           @Param("id") String id,
-                                           @Param("projectName") String projectName,
-                                           @Param("projectType") String projectType,
-                                           @Param("adcd") String adcd,
-                                           @Param("orderBy") String orderBy,
-                                           @Param("pageNum") int pageNum,
-                                           @Param("pageSize") int pageSize);
+    IPage<BsSgcJsjdBuiProgress> getProgress(@Param("userId") String userId,
+                                            @Param("userType") String userType,
+                                            @Param("id") String id,
+                                            @Param("projectName") String projectName,
+                                            @Param("projectType") String projectType,
+                                            @Param("adcd") String adcd,
+                                            @Param("orderBy") String orderBy,
+                                            Page page);
 }

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

@@ -38,16 +38,17 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageNum") int pageNum,
                                            @Param("pageSize") int pageSize);
 
-    List<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
+    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
                                                @Param("projectName") String projectName,
+                                               @Param("isMajor") String isMajor,
                                                @Param("projectType") String projectType,
                                                @Param("adcd") String adcd,
                                                @Param("orderBy") String orderBy,
-                                               @Param("pageNum") int pageNum,
-                                               @Param("pageSize") int pageSize);
+                                               Page page);
 
     IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
                                                @Param("projectName") String projectName,
+                                               @Param("isMajor") String isMajor,
                                                @Param("projectType") String projectType,
                                                @Param("adcd") String adcd,
                                                @Param("orderBy") String orderBy,

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

@@ -46,15 +46,12 @@ public class BsSgcJsjdBuiProgressService extends BaseService<BsSgcJsjdBuiProgres
 
         assert sysUser != null;
 
-        List<BsSgcJsjdBuiProgress> list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
+        IPage<BsSgcJsjdBuiProgress> list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                 data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
-                "create_time", sp.getPageNum(), sp.getPageSize());
+                "create_time",new Page<>(sp.getPageNum(), sp.getPageSize()));
 
-        Page<BsSgcJsjdBuiProgress> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
-        return page;
+        return list;
     }
 }

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

@@ -109,11 +109,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
 
 
         if (ObjectUtil.isNull(params)) {
-            list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),
-                    "create_time",sp.getPageNum(),sp.getPageSize());
-        }else {
-            list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),
+                    "create_time", sp.getPageNum(), sp.getPageSize());
+        } else {
+            list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(),
                     data.getProjectName(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
         }
 
@@ -154,21 +154,35 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
 
         Map<String, Object> params = sp.getParams();
 
-        assert sysUser != null;
-        List<BsSgcjsjdBuiProInfo> list = null;
+        String isMajor = null;
 
-        if (ObjectUtil.isNull(params)) {
-            list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(),data.getProjectName(),data.getProjectType(),
-                    sysXzqhService.getSubString(sp.getData().getAdcd()),
-                    "create_time",sp.getPageNum(),sp.getPageSize());
-        }else {
-            list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(),
-                    data.getProjectName(),data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
+
+
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor=split[0];
+            if (" ".equals(split[1])) {
+                projectType=null;
+            }else {
+                projectType=split[1];
+            }
         }
 
-        for (BsSgcjsjdBuiProInfo buiProInfo : list) {
-            String proNo = buiProInfo.getProNo();
-            String proCode = buiProInfo.getProCode();
+
+
+        assert sysUser != null;
+        IPage<BsSgcjsjdBuiProInfo> list = null;
+
+
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType,
+                sysXzqhService.getSubString(sp.getData().getAdcd()),
+                "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            String proNo = list.getRecords().get(i).getProNo();
+            String proCode = list.getRecords().get(i).getProCode();
 
             BsSgcJsjdBuiConAcc conAcc = bsSgcJsjdBuiConAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiConAcc.class)
                     .eq(BsSgcJsjdBuiConAcc::getProCode, proCode)
@@ -179,17 +193,17 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     .eq(BsSgcJsjdBuiComAcc::getProNo, proNo));
 
             if (conAcc != null && comAcc != null) {
-                buiProInfo.setProjectPhase("3");
-            }else {
-                buiProInfo.setProjectPhase("2");
+                list.getRecords().get(i).setProjectPhase("3");
+            } else {
+                list.getRecords().get(i).setProjectPhase("2");
             }
         }
 
-        Page<BsSgcjsjdBuiProInfo> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
-        return page;
+
+
+
+        return list;
 
     }
 
@@ -197,6 +211,17 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysUser sysUser = UserUtils.getUser();
 
         BsSgcjsjdBuiProInfo data = sp.getData();
+        String isMajor = null;
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor=split[0];
+            if (" ".equals(split[1])) {
+                projectType=null;
+            }else {
+                projectType=split[1];
+            }
+        }
 
         Map<String, Object> params = sp.getParams();
 
@@ -206,11 +231,65 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
-        list=bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(),data.getProjectName(),data.getProjectType(),
+        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(),isMajor, data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
-                "create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
+                "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+
+        return list;
+    }
+
+    public IPage listBy(SearchParam<BsSgcjsjdBuiProInfo> sp) {
+        SysUser sysUser = UserUtils.getUser();
+
+        BsSgcjsjdBuiProInfo data = sp.getData();
+
+        Map<String, Object> params = sp.getParams();
+
+        String isMajor = null;
+
+
+
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor=split[0];
+            if (" ".equals(split[1])) {
+                projectType=null;
+            }else {
+                projectType=split[1];
+            }
+        }
+
+
+
+        assert sysUser != null;
+        IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType,
+                sysXzqhService.getSubString(sp.getData().getAdcd()),
+                "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            String proNo = list.getRecords().get(i).getProNo();
+            String proCode = list.getRecords().get(i).getProCode();
+
+            BsSgcJsjdBuiConAcc conAcc = bsSgcJsjdBuiConAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiConAcc.class)
+                    .eq(BsSgcJsjdBuiConAcc::getProCode, proCode)
+                    .eq(BsSgcJsjdBuiConAcc::getProNo, proNo));
+
+            BsSgcJsjdBuiComAcc comAcc = bsSgcJsjdBuiComAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiComAcc.class)
+                    .eq(BsSgcJsjdBuiComAcc::getProCode, proCode)
+                    .eq(BsSgcJsjdBuiComAcc::getProNo, proNo));
+
+            if (conAcc != null && comAcc != null) {
+                list.getRecords().remove(i);
+            }
+        }
+
         return list;
+
     }
 }

jwtech-system/src/main/java/com/kms/statistics/controller/ProgressStatisticsController.java

@@ -3,7 +3,9 @@ package com.kms.statistics.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jianwei.common.core.domain.SearchParam;
 import com.kms.build.domain.BsSgcJsjdBuiProgress;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.service.BsSgcJsjdBuiProgressService;
+import com.kms.build.service.BsSgcjsjdBuiProInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,6 +20,9 @@ public class ProgressStatisticsController {
     @Autowired
     private BsSgcJsjdBuiProgressService bsSgcJsjdBuiProgressService;
 
+    @Autowired
+    private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService;
+
 
     @PostMapping("/list")
     @ApiOperation("进度管理列表")
@@ -26,4 +31,12 @@ public class ProgressStatisticsController {
         return bsSgcJsjdBuiProgressService.getProgress(sp);
     }
 
+
+    @PostMapping("/listBy")
+    @ApiOperation("进度管理列表")
+    public IPage listBy(@RequestBody SearchParam<BsSgcjsjdBuiProInfo> sp)
+    {
+        return bsSgcjsjdBuiProInfoService.listBy(sp);
+    }
+
 }

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

@@ -20,13 +20,12 @@
     <resultMap id="BsSgcjsjdBuiProgress" type="BsSgcjsjdBuiProgress">
         <id column="id" property="id"/>
         <result property="projectName" column="PROJECT_NAME"/>
-        <result property="projectName" column="project_type"/>
+        <result property="projectType" column="project_type"/>
         <result property="yearlyCumulativeWorkload" column="YEARLY_CUMULATIVE_WORKLOAD"/>
         <result property="updateTime" column="UPDATE_TIME"/>
     </resultMap>
 
     <select id="getProgress" resultType="com.kms.build.domain.BsSgcJsjdBuiProgress">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <if test="userType==01">
             WHERE
@@ -47,7 +46,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by pi.${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -59,7 +58,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by pi.${orderBy} desc
         </if>
     </select>
 </mapper>

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

@@ -163,6 +163,9 @@
             <if test="projectName!=null and projectName!=''">
                 and pi.project_name like concat('%',#{projectName},'%')
             </if>
+            <if test="isMajor!=null and isMajor!=''">
+                and pi.is_major=#{isMajor}
+            </if>
             <if test="projectType!=null and projectType!=''">
                 and pi.project_type=#{projectType}
             </if>
@@ -179,6 +182,9 @@
             <if test="projectName!=null and projectName!=''">
                 and pp.project_name like concat('%',#{projectName},'%')
             </if>
+            <if test="isMajor!=null and isMajor!=''">
+                and pi.is_major=#{isMajor}
+            </if>
             <if test="projectType!=null and projectType!=''">
                 and pp.project_type=#{projectType}
             </if>