提交代码

ruoyi-ui/src/views/project/projectMeasure/index.vue

@@ -599,9 +599,9 @@ export default {
     showInfoType(dict){
       if(this.form.measureType){
         if(this.form.measureType=='6'){
-          return dict.raw.remark == 'gjgc';
+          return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all';
         }else{
-          return !dict.raw.remark;
+          return !dict.raw.remark || dict.raw.remark == 'all';
         }
       }else{
         return false;

ruoyi-ui/src/views/project/projectStandard/standardType.js

@@ -127,7 +127,6 @@ export default [
           { label: "空调主机房", id: 20706 },
         ],
       },
-
       {
         label: "建筑电气",
         id: 208,
@@ -168,7 +167,6 @@ export default [
           { label: "信息化应用系统", id: 20905 },
         ],
       },
-
       {
         label: "建筑节能",
         id: 210,
@@ -236,7 +234,6 @@ export default [
           { label: "吊篮", id: 30204 },
         ],
       },
-
       {
         label: "模板支撑体系",
         id: 303,
@@ -247,7 +244,6 @@ export default [
           { label: "特殊部位支撑", id: 30304 },
         ],
       },
-
       {
         label: "道路工程",
         id: 304,
@@ -260,7 +256,6 @@ export default [
           { label: "路面施工", id: 30406 },
         ],
       },
-
       {
         label: "管道工程",
         id: 305,
@@ -276,7 +271,6 @@ export default [
           { label: "顶管顶进", id: 30509 },
         ],
       },
-
       {
         label: "桥梁工程",
         id: 306,
@@ -286,7 +280,6 @@ export default [
           { label: "上部结构防护施工", id: 30603 },
         ],
       },
-
       {
         label: "特种作业",
         id: 307,

ruoyi-ui/src/views/statistics/statisticsProject/index.vue

@@ -201,6 +201,20 @@
           </template>
         </el-table-column>
         <el-table-column label="安全隐患排查" align="center">
+          <el-table-column
+            label="集团公司"
+            align="center"
+            prop="aqyhpc_jtgs"
+            width="90"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="子公司"
+            align="center"
+            prop="aqyhpc_zrzt"
+            width="90"
+            show-overflow-tooltip
+          />
           <el-table-column
             label="甲方代表"
             align="center"
@@ -247,6 +261,20 @@
       </el-table-column>
       <el-table-column label="质量管理" align="center">
         <el-table-column label="质量隐患排查" align="center">
+          <el-table-column
+            label="集团公司"
+            align="center"
+            prop="zlyhpc_jtgs"
+            width="90"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="子公司"
+            align="center"
+            prop="zlyhpc_zrzt"
+            width="90"
+            show-overflow-tooltip
+          />
           <el-table-column
             label="甲方代表"
             align="center"

ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue

@@ -288,7 +288,7 @@
               >整改日志</el-button
             >
             <el-button
-              v-if="scope.row.vDel == '0'"
+              v-if="getIsVdel(scope.row)"
               size="mini"
               type="text"
               icon="el-icon-delete"
@@ -624,6 +624,9 @@ export default {
       };
       this.resetForm("form");
     },
+    getIsVdel(){
+      return false;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue

@@ -110,7 +110,7 @@
     </el-row>
     <el-alert title="操作说明" class="tips">
       <template slot="title">
-        <div><strong>数据同步:</strong>将选中行的数据同步到当前项目的其它行！</div>
+        <div><strong>数据同步:</strong>将选中行的数据同步到（当前项目或项目为空）的其它行！</div>
         <div><strong>批量提交:</strong>将选中行的数据，数据验证通过后一次全部提交！</div>
       </template>
     </el-alert>
@@ -156,20 +156,18 @@
         </el-table-column>
         <el-table-column label="隐患类型" align="center" prop="dangerType" width="170">
           <template slot-scope="scope">
-            <el-select
+            <el-row style="line-height: 36px; margin-bottom: 5px">
-              v-if="scope.row.infoType == 1"
+              <el-select v-model="scope.row.problemType" placeholder="请选择问题类型">
-              v-model="scope.row.dangerType"
+                <el-option
-              placeholder="请选择隐患类型"
+                  v-for="dict in dict.type.smz_problem_type"
-            >
+                  :key="dict.value"
-              <el-option
+                  :label="dict.label"
-                v-for="dict in dict.type.ssp_zlyhlx"
+                  :value="dict.value"
-                :key="dict.value"
+                ></el-option>
-                :label="dict.label"
+              </el-select>
-                :value="dict.value"
+            </el-row>
-              ></el-option>
+            <el-row style="line-height: 36px; margin-bottom: 5px">
-            </el-select>
+              <el-select
-            <el-select
-              v-if="scope.row.infoType == 0"
               v-model="scope.row.dangerType"
               placeholder="请选择隐患类型"
             >
@@ -180,6 +178,7 @@
                 :value="dict.value"
               ></el-option>
             </el-select>
+            </el-row>
           </template>
         </el-table-column>
         <el-table-column label="施工部位" align="center" prop="workParts" width="180">
@@ -359,8 +358,8 @@ import {
 } from "@/api/trouble/smzSspProblemmodifyDraft";
 
 export default {
-  name: "SmzSspProblemmodifyDraft",
+  name: "SmzPshProblemmodifyDraft",
-  dicts: ["ssp_zlyhlx", "ssp_aqyhlx"],
+  dicts: ["ssp_aqyhlx","smz_problem_type"],
   data() {
     return {
       // 遮罩层
@@ -518,6 +517,10 @@ export default {
         this.$message.error("请上传隐患图片！");
         return false;
       }
+      if (!row.problemType) {
+        this.$message.error("请选择问题类型！");
+        return false;
+      }
       if (!row.dangerType) {
         this.$message.error("请选择隐患类型！");
         return false;
@@ -568,6 +571,10 @@ export default {
           this.$message.error("第" + indexs[i] + "行请上传隐患图片！");
           return false;
         }
+        if (!row.problemType) {
+          this.$message.error("第" + indexs[i] + "行请选择问题类型！");
+          return false;
+        }
         if (!row.dangerType) {
           this.$message.error("第" + indexs[i] + "行请选择隐患类型！");
           return false;
@@ -702,14 +709,28 @@ export default {
       let data = this.smzSspProblemmodifyDraftList;
       let row = data[indexs - 1];
       for (let i = 0; i < data.length; i++) {
-        if (data[i].index != row.index && data[i].projectId == row.projectId) {
+        if (data[i].index != row.index){
-          data[i].lordSent = row.lordSent;
+          if(!data[i].projectId){
+            data[i].projectId = row.projectId;
+            data[i].problemArea = row.problemArea;
+            data[i].problemType = row.problemType;
+            data[i].lordSent = row.lordSent;
           data[i].lordSentUser = row.lordSentUser;
           data[i].copySend = row.copySend;
           data[i].copySendUser = row.copySendUser;
           data[i].recheckSend = row.recheckSend;
           data[i].recheckSendUser = row.recheckSendUser;
           data[i].nickedTime = row.nickedTime;
+          }else if(data[i].projectId == row.projectId){
+            data[i].problemType = row.problemType;
+            data[i].lordSent = row.lordSent;
+          data[i].lordSentUser = row.lordSentUser;
+          data[i].copySend = row.copySend;
+          data[i].copySendUser = row.copySendUser;
+          data[i].recheckSend = row.recheckSend;
+          data[i].recheckSendUser = row.recheckSendUser;
+          data[i].nickedTime = row.nickedTime;
+          }
         }
       }
       this.smzSspProblemmodifyDraftList = data;
@@ -740,6 +761,7 @@ export default {
         createUserDeptName: this.$store.getters.dept.deptName,
         createTime: this.$dt(new Date()).format("YYYY-MM-DD HH:mm:ss"),
         isDel: 0,
+        problemType:'1',
       };
       this.smzSspProblemmodifyDraftList.push(row);
       this.changeProject(row.projectId, row);

ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue

@@ -110,7 +110,7 @@
     </el-row>
     <el-alert title="操作说明" class="tips">
       <template slot="title">
-        <div><strong>数据同步:</strong>将选中行的数据同步到当前项目的其它行！</div>
+        <div><strong>数据同步:</strong>将选中行的数据同步到（当前项目或项目为空）的其它行！</div>
         <div><strong>批量提交:</strong>将选中行的数据，数据验证通过后一次全部提交！</div>
       </template>
     </el-alert>
@@ -156,30 +156,26 @@
         </el-table-column>
         <el-table-column label="隐患类型" align="center" prop="dangerType" width="170">
           <template slot-scope="scope">
-            <el-select
+            <el-row style="line-height: 36px; margin-bottom: 5px">
-              v-if="scope.row.infoType == 1"
+              <el-select v-model="scope.row.problemType" placeholder="请选择问题类型">
-              v-model="scope.row.dangerType"
+                <el-option
-              placeholder="请选择隐患类型"
+                  v-for="dict in dict.type.smz_problem_type"
-            >
+                  :key="dict.value"
-              <el-option
+                  :label="dict.label"
-                v-for="dict in dict.type.ssp_zlyhlx"
+                  :value="dict.value"
-                :key="dict.value"
+                ></el-option>
-                :label="dict.label"
+              </el-select>
-                :value="dict.value"
+            </el-row>
-              ></el-option>
+            <el-row style="line-height: 36px; margin-bottom: 5px">
-            </el-select>
+              <el-select v-model="scope.row.dangerType" placeholder="请选择隐患类型">
-            <el-select
+                <el-option
-              v-if="scope.row.infoType == 0"
+                  v-for="dict in dict.type.ssp_zlyhlx"
-              v-model="scope.row.dangerType"
+                  :key="dict.value"
-              placeholder="请选择隐患类型"
+                  :label="dict.label"
-            >
+                  :value="dict.value"
-              <el-option
+                ></el-option>
-                v-for="dict in dict.type.ssp_aqyhlx"
+              </el-select>
-                :key="dict.value"
+            </el-row>
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
           </template>
         </el-table-column>
         <el-table-column label="施工部位" align="center" prop="workParts" width="180">
@@ -360,7 +356,7 @@ import {
 
 export default {
   name: "SmzSspProblemmodifyDraft",
-  dicts: ["ssp_zlyhlx", "ssp_aqyhlx"],
+  dicts: ["ssp_zlyhlx", "smz_problem_type"],
   data() {
     return {
       // 遮罩层
@@ -409,7 +405,7 @@ export default {
       projectDeptOptions: [],
       projectIds: [],
       projectUnitUsers: [],
-      userPhoneNumber:"",
+      userPhoneNumber: "",
     };
   },
   created() {
@@ -471,7 +467,7 @@ export default {
                 jobTypeName: "集团公司",
               });
             }
-            this.projectUnitUsers.push({ projectId: proj, data: list, fjdata:d.data });
+            this.projectUnitUsers.push({ projectId: proj, data: list, fjdata: d.data });
           });
         });
         this.smzSspProblemmodifyDraftList = response.rows;
@@ -518,6 +514,10 @@ export default {
         this.$message.error("请上传隐患图片！");
         return false;
       }
+      if (!row.problemType) {
+        this.$message.error("请选择问题类型！");
+        return false;
+      }
       if (!row.dangerType) {
         this.$message.error("请选择隐患类型！");
         return false;
@@ -568,6 +568,10 @@ export default {
           this.$message.error("第" + indexs[i] + "行请上传隐患图片！");
           return false;
         }
+        if (!row.problemType) {
+          this.$message.error("第" + indexs[i] + "行请选择问题类型！");
+          return false;
+        }
         if (!row.dangerType) {
           this.$message.error("第" + indexs[i] + "行请选择隐患类型！");
           return false;
@@ -702,14 +706,28 @@ export default {
       let data = this.smzSspProblemmodifyDraftList;
       let row = data[indexs - 1];
       for (let i = 0; i < data.length; i++) {
-        if (data[i].index != row.index && data[i].projectId == row.projectId) {
+        if (data[i].index != row.index) {
-          data[i].lordSent = row.lordSent;
+          if (!data[i].projectId) {
-          data[i].lordSentUser = row.lordSentUser;
+            data[i].projectId = row.projectId;
-          data[i].copySend = row.copySend;
+            data[i].problemArea = row.problemArea;
-          data[i].copySendUser = row.copySendUser;
+            data[i].problemType = row.problemType;
-          data[i].recheckSend = row.recheckSend;
+            data[i].lordSent = row.lordSent;
-          data[i].recheckSendUser = row.recheckSendUser;
+            data[i].lordSentUser = row.lordSentUser;
-          data[i].nickedTime = row.nickedTime;
+            data[i].copySend = row.copySend;
+            data[i].copySendUser = row.copySendUser;
+            data[i].recheckSend = row.recheckSend;
+            data[i].recheckSendUser = row.recheckSendUser;
+            data[i].nickedTime = row.nickedTime;
+          } else if(data[i].projectId == row.projectId){
+            data[i].problemType = row.problemType;
+            data[i].lordSent = row.lordSent;
+            data[i].lordSentUser = row.lordSentUser;
+            data[i].copySend = row.copySend;
+            data[i].copySendUser = row.copySendUser;
+            data[i].recheckSend = row.recheckSend;
+            data[i].recheckSendUser = row.recheckSendUser;
+            data[i].nickedTime = row.nickedTime;
+          }
         }
       }
       this.smzSspProblemmodifyDraftList = data;
@@ -720,7 +738,8 @@ export default {
         id: null,
         projectId: this.projectOptions.length == 1 ? this.projectOptions[0].id : null,
         infoType: "1",
-        problemArea: this.projectOptions.length == 1 ? this.projectOptions[0].projectName : null,
+        problemArea:
+          this.projectOptions.length == 1 ? this.projectOptions[0].projectName : null,
         workParts: null,
         changeInfo: null,
         lordSent: null,
@@ -739,6 +758,7 @@ export default {
         createUserDeptName: this.$store.getters.dept.deptName,
         createTime: this.$dt(new Date()).format("YYYY-MM-DD HH:mm:ss"),
         isDel: 0,
+        problemType: "1",
       };
       this.smzSspProblemmodifyDraftList.push(row);
       this.changeProject(row.projectId, row);
@@ -771,7 +791,7 @@ export default {
                 jobTypeName: "集团公司",
               });
             }
-            this.projectUnitUsers.push({ projectId: val, data: list,fjdata:d.data });
+            this.projectUnitUsers.push({ projectId: val, data: list, fjdata: d.data });
           });
         }
         for (let i = 0; i < this.projectOptions.length; i++) {

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java

@@ -193,18 +193,18 @@ public class ProjectViewController extends BaseBuildNodeController{
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 10, 17));//单元格合并
-
             tempCell = tempRow.createCell(18);
-            tempCell.setCellValue("质量管理");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(19);
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 10, 19));//单元格合并
+
             tempCell = tempRow.createCell(20);
-            tempCell.setCellValue("");
+            tempCell.setCellValue("质量管理");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(21);
@@ -223,10 +223,8 @@ public class ProjectViewController extends BaseBuildNodeController{
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 18, 24));//单元格合并
-
             tempCell = tempRow.createCell(25);
-            tempCell.setCellValue("视频管理");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(26);
@@ -237,21 +235,39 @@ public class ProjectViewController extends BaseBuildNodeController{
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 25, 27));//单元格合并
-
             tempCell = tempRow.createCell(28);
-            tempCell.setCellValue("工程管理");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 20, 28));//单元格合并
+
             tempCell = tempRow.createCell(29);
-            tempCell.setCellValue("");
+            tempCell.setCellValue("视频管理");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(30);
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 28, 30));//单元格合并
+            tempCell = tempRow.createCell(31);
+            tempCell.setCellValue("");
+            tempCell.setCellStyle(headerStyle);
+
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 29, 31));//单元格合并
+
+            tempCell = tempRow.createCell(32);
+            tempCell.setCellValue("工程管理");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(33);
+            tempCell.setCellValue("");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(34);
+            tempCell.setCellValue("");
+            tempCell.setCellStyle(headerStyle);
+
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 32, 34));//单元格合并
 
             //合计行
             sheet.setColumnWidth(0, 400 * 20 + 323);
@@ -285,6 +301,10 @@ public class ProjectViewController extends BaseBuildNodeController{
             sheet.setColumnWidth(28, 150 * 20 + 323);
             sheet.setColumnWidth(29, 150 * 20 + 323);
             sheet.setColumnWidth(30, 150 * 20 + 323);
+            sheet.setColumnWidth(31, 150 * 20 + 323);
+            sheet.setColumnWidth(32, 150 * 20 + 323);
+            sheet.setColumnWidth(33, 150 * 20 + 323);
+            sheet.setColumnWidth(34, 150 * 20 + 323);
 
             tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short) 400);// 设置行高
@@ -352,71 +372,87 @@ public class ProjectViewController extends BaseBuildNodeController{
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 12, 14));//单元格合并
-
             tempCell = tempRow.createCell(15);
-            tempCell.setCellValue("特种人员");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(16);
-            tempCell.setCellValue("应急演练");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 12, 16));//单元格合并
+
             tempCell = tempRow.createCell(17);
-            tempCell.setCellValue("教育培训");
+            tempCell.setCellValue("特种人员");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(18);
-            tempCell.setCellValue("质量隐患排查");
+            tempCell.setCellValue("应急演练");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(19);
-            tempCell.setCellValue("");
+            tempCell.setCellValue("教育培训");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(20);
+            tempCell.setCellValue("质量隐患排查");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(21);
             tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 18, 20));//单元格合并
-
-            tempCell = tempRow.createCell(21);
-            tempCell.setCellValue("材料取样复试");
-            tempCell.setCellStyle(headerStyle);
-
             tempCell = tempRow.createCell(22);
-            tempCell.setCellValue("材料封样");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(23);
-            tempCell.setCellValue("实测实量");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(24);
-            tempCell.setCellValue("举牌验收");
+            tempCell.setCellValue("");
             tempCell.setCellStyle(headerStyle);
 
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 20, 24));//单元格合并
+
             tempCell = tempRow.createCell(25);
-            tempCell.setCellValue("视频监控");
+            tempCell.setCellValue("材料取样复试");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(26);
-            tempCell.setCellValue("AI监控");
+            tempCell.setCellValue("材料封样");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(27);
-            tempCell.setCellValue("项目全景");
+            tempCell.setCellValue("实测实量");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(28);
-            tempCell.setCellValue("项目标准化");
+            tempCell.setCellValue("举牌验收");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(29);
-            tempCell.setCellValue("审批进行中");
+            tempCell.setCellValue("视频监控");
             tempCell.setCellStyle(headerStyle);
 
             tempCell = tempRow.createCell(30);
+            tempCell.setCellValue("AI监控");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(31);
+            tempCell.setCellValue("项目全景");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(32);
+            tempCell.setCellValue("项目标准化");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(33);
+            tempCell.setCellValue("审批进行中");
+            tempCell.setCellStyle(headerStyle);
+
+            tempCell = tempRow.createCell(34);
             tempCell.setCellValue("审批已完成");
             tempCell.setCellStyle(headerStyle);
 
@@ -433,12 +469,16 @@ public class ProjectViewController extends BaseBuildNodeController{
             headArrays.add("环境预警");
             headArrays.add("");
             headArrays.add("");
+            headArrays.add("集团公司");
+            headArrays.add("子公司");
             headArrays.add("甲方经理");
             headArrays.add("监理单位");
             headArrays.add("总包单位");
             headArrays.add("");
             headArrays.add("");
             headArrays.add("");
+            headArrays.add("集团公司");
+            headArrays.add("子公司");
             headArrays.add("甲方经理");
             headArrays.add("监理单位");
             headArrays.add("总包单位");
@@ -463,7 +503,7 @@ public class ProjectViewController extends BaseBuildNodeController{
                 if(i<2){
                     sheet.addMergedRegion(new CellRangeAddress(rowNum-3, rowNum - 1, i, i));//单元格合并
                 }
-                if((i>3 && i<6) || (i>9 && i<12) || (i>14 && i<18) || i>20){
+                if((i>3 && i<6) || (i>9 && i<12) || (i>16 && i<20) || i>24){
                     sheet.addMergedRegion(new CellRangeAddress(rowNum-2, rowNum - 1, i, i));//单元格合并
                 }
             }
@@ -523,78 +563,94 @@ public class ProjectViewController extends BaseBuildNodeController{
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(12);
-                tempCell.setCellValue(view.getAqyhpc_jfdb());
+                tempCell.setCellValue(view.getAqyhpc_jtgs());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(13);
-                tempCell.setCellValue(view.getAqyhpc_jldw());
+                tempCell.setCellValue(view.getAqyhpc_zrzt());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(14);
-                tempCell.setCellValue(view.getAqyhpc_zbdw());
+                tempCell.setCellValue(view.getAqyhpc_jfdb());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(15);
-                tempCell.setCellValue(view.getTzry());
+                tempCell.setCellValue(view.getAqyhpc_jldw());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(16);
-                tempCell.setCellValue(view.getYjyl());
+                tempCell.setCellValue(view.getAqyhpc_zbdw());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(17);
-                tempCell.setCellValue(view.getZxpx());
+                tempCell.setCellValue(view.getTzry());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(18);
-                tempCell.setCellValue(view.getZlyhpc_jfdb());
+                tempCell.setCellValue(view.getYjyl());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(19);
-                tempCell.setCellValue(view.getZlyhpc_jldw());
+                tempCell.setCellValue(view.getZxpx());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(20);
-                tempCell.setCellValue(view.getZlyhpc_zbdw());
+                tempCell.setCellValue(view.getZlyhpc_jtgs());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(21);
-                tempCell.setCellValue(view.getClqyfs());
+                tempCell.setCellValue(view.getZlyhpc_zrzt());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(22);
-                tempCell.setCellValue(view.getClfy());
+                tempCell.setCellValue(view.getZlyhpc_jfdb());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(23);
-                tempCell.setCellValue(view.getCscl());
+                tempCell.setCellValue(view.getZlyhpc_jldw());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(24);
-                tempCell.setCellValue(view.getJpys());
+                tempCell.setCellValue(view.getZlyhpc_zbdw());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(25);
-                tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入");
+                tempCell.setCellValue(view.getClqyfs());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(26);
-                tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入");
+                tempCell.setCellValue(view.getClfy());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(27);
-                tempCell.setCellValue(view.getYssys());
+                tempCell.setCellValue(view.getCscl());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(28);
-                tempCell.setCellValue(view.getBzh());
+                tempCell.setCellValue(view.getJpys());
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(29);
-                tempCell.setCellValue(view.getGcsq());
+                tempCell.setCellValue(view.getSsjk().equals("0")?"未接入":"已接入");
                 tempCell.setCellStyle(contentStyle);
 
                 tempCell = tempRow.createCell(30);
+                tempCell.setCellValue(view.getAijk().equals("0")?"未接入":"已接入");
+                tempCell.setCellStyle(contentStyle);
+
+                tempCell = tempRow.createCell(31);
+                tempCell.setCellValue(view.getYssys());
+                tempCell.setCellStyle(contentStyle);
+
+                tempCell = tempRow.createCell(32);
+                tempCell.setCellValue(view.getBzh());
+                tempCell.setCellStyle(contentStyle);
+
+                tempCell = tempRow.createCell(33);
+                tempCell.setCellValue(view.getGcsq());
+                tempCell.setCellStyle(contentStyle);
+
+                tempCell = tempRow.createCell(34);
                 tempCell.setCellValue(view.getGcsp());
                 tempCell.setCellStyle(contentStyle);
 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ProjectViewExport.java

@@ -25,6 +25,12 @@ public class ProjectViewExport implements Serializable {
     @Excel(name = "一切险", width = 20,align = HorizontalAlignment.CENTER, dictType = "sur_project_insurance_state")
     private String yqx;
 
+    @Excel(name = "安全隐患-集团公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
+    private String aqyhpc_jtgs;
+
+    @Excel(name = "安全隐患-子公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
+    private String aqyhpc_zrzt;
+
     @Excel(name = "安全隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
     private String aqyhpc_jfdb;
 
@@ -43,6 +49,12 @@ public class ProjectViewExport implements Serializable {
     @Excel(name = "教育培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
     private String zxpx;
 
+    @Excel(name = "质量隐患-集团公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
+    private String zlyhpc_jtgs;
+
+    @Excel(name = "质量隐患-子公司", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
+    private String zlyhpc_zrzt;
+
     @Excel(name = "质量隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
     private String zlyhpc_jfdb;
 
@@ -359,4 +371,36 @@ public class ProjectViewExport implements Serializable {
     public void setAqyjs(String aqyjs) {
         this.aqyjs = aqyjs;
     }
+
+    public String getAqyhpc_jtgs() {
+        return aqyhpc_jtgs;
+    }
+
+    public void setAqyhpc_jtgs(String aqyhpc_jtgs) {
+        this.aqyhpc_jtgs = aqyhpc_jtgs;
+    }
+
+    public String getAqyhpc_zrzt() {
+        return aqyhpc_zrzt;
+    }
+
+    public void setAqyhpc_zrzt(String aqyhpc_zrzt) {
+        this.aqyhpc_zrzt = aqyhpc_zrzt;
+    }
+
+    public String getZlyhpc_jtgs() {
+        return zlyhpc_jtgs;
+    }
+
+    public void setZlyhpc_jtgs(String zlyhpc_jtgs) {
+        this.zlyhpc_jtgs = zlyhpc_jtgs;
+    }
+
+    public String getZlyhpc_zrzt() {
+        return zlyhpc_zrzt;
+    }
+
+    public void setZlyhpc_zrzt(String zlyhpc_zrzt) {
+        this.zlyhpc_zrzt = zlyhpc_zrzt;
+    }
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java

@@ -131,7 +131,6 @@ public class SmzSspProblemmodify extends BaseEntity
     private Integer roleType;
     private String dangerTypeName;
     private String deptName;//检查单位
-    private String vDel;
     private String flag;//整改超时标识
 
     private String dangerLabel;
@@ -419,14 +418,6 @@ public class SmzSspProblemmodify extends BaseEntity
         this.roleType = roleType;
     }
 
-    public String getvDel() {
-        return vDel;
-    }
-
-    public void setvDel(String vDel) {
-        this.vDel = vDel;
-    }
-
     public String getDangerTypeName() {
         return dangerTypeName;
     }

yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java

@@ -89,7 +89,6 @@ public class WorkTrain extends BaseEntity
     private String trainDeptIds;
 
     private String trainNatureName;
-    private String vDel;
     private Long deptId;//子公司查询使用
     private String dataTypeName;
 
@@ -200,14 +199,6 @@ public class WorkTrain extends BaseEntity
         this.projectName = projectName;
     }
 
-    public String getvDel() {
-        return vDel;
-    }
-
-    public void setvDel(String vDel) {
-        this.vDel = vDel;
-    }
-
     public String getTrainDeptIds() {
         return trainDeptIds;
     }

yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml

@@ -7,6 +7,12 @@
     <!--查询项目总包单位-->
     <select id="selectStatisticsProjectList" parameterType="com.yanzhu.jh.project.domain.SurProject"  resultType="com.yanzhu.jh.project.domain.vo.ProjectViewExport">
         select sp.id as projectId,sp.projectName, pui.unitId,pui.unitName,
+        (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=3 and a.infoType=0 and a.isDel=0
+        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
+        )as aqyhpc_jtgs,
+        (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=4 and a.infoType=0 and a.isDel=0
+        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
+        )as aqyhpc_zrzt,
         (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=5 and a.infoType=0 and a.isDel=0
         <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
         )as aqyhpc_jfdb,
@@ -18,6 +24,12 @@
         )as aqyhpc_zbdw,
         (select count(1) from work_train a LEFT JOIN work_train_dept b on a.id=b.train_id and b.is_main='Y' where a.project_id=sp.id and b.dept_id=pui.unitId and a.train_type=1 and a.is_del=0 ) as yjyl,
         (select count(1) from work_train a LEFT JOIN work_train_dept b on a.id=b.train_id and b.is_main='Y' where a.project_id=sp.id and b.dept_id=pui.unitId and a.train_type=0 and a.is_del=0 ) as zxpx,
+        (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=3 and a.infoType=1 and a.isDel=0
+        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
+        )as zlyhpc_jtgs,
+        (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=4 and a.infoType=1 and a.isDel=0
+        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
+        )as zlyhpc_zrzt,
         (select count(1) from smz_ssp_problemmodify a where a.projectId = sp.id and a.roleType=5 and a.infoType=1 and a.isDel=0
         <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(a.createTime) between #{params.beginTime} and #{params.endTime}</if>
         )as zlyhpc_jfdb,

yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml

@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recheckSendUser"    column="recheckSendUser"    />
         <result property="roleType"    column="roleType"    />
         <result property="problemType"    column="problemType"    />
-        <result property="vDel"    column="v_del"    />
         <result property="createBy" column="createBy"/>
         <result property="deptName" column="deptName"/>
         <result property="createUserName" column="createUserName"/>
@@ -559,10 +558,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT p.infotype,COUNT(1) as total
         FROM smz_ssp_problemmodify p
         left join sur_project sp on sp.id=p.projectId
-        WHERE p.isDel=0 and sp.progressVisible=0 and sp.isDel=0
+        WHERE p.isDel=0 and sp.isDel=0
         <if test="projectId > 0"> and p.projectId=#{projectId}</if>
         <if test="deptId > 0 ">and sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and p.projectId in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -574,10 +573,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
         select '96' as infotype,count(1) as total from dev_ai_project_data  ad
         left join sur_project sp on ad.project_id=sp.id
-        where  sp.progressVisible=0 and sp.isDel=0
+        where sp.isDel=0
         <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
         <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ad.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -586,6 +585,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         and DATE(ad.create_time)=Date(#{startDate})
         and ad.is_del=0
+        UNION ALL
+        select '97' as infotype,count(1) as total from flow_labour_info  fli
+        left join sur_project sp on fli.project_id=sp.id
+        where fli.is_del=0
+        <if test="projectId &gt; 0"> and fli.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and fli.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and DATE(fli.create_time)=Date(#{startDate})
     </select>
 
     <select id="countByDateRange" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
@@ -612,10 +625,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from (
         SELECT ssp.infotype,COUNT(1) as total FROM smz_ssp_problemmodify ssp
         left join sur_project sp on sp.id=ssp.projectId
-        WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0
+        WHERE ssp.isDel=0 and sp.isDel=0
         <if test="projectId > 0"> and ssp.projectId=#{projectId}</if>
         <if test="deptId > 0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ssp.projectId in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -630,10 +643,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
         select '96' as infotype,count(1) as total from dev_ai_project_data ad
         left join sur_project sp on ad.project_id=sp.id
-        where sp.progressVisible=0 and sp.isDel=0
+        where sp.isDel=0
         <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
         <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ad.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -642,6 +655,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         and DATE(ad.create_time) between Date(#{startDate}) and Date(#{endDate})
         and ad.is_del=0
+        UNION ALL
+        select '97' as infotype,count(1) as total from flow_labour_info fli
+        left join sur_project sp on fli.project_id=sp.id
+        where fli.is_del=0
+        <if test="projectId &gt; 0"> and fli.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and fli.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and DATE(fli.create_time) between Date(#{startDate}) and Date(#{endDate})
     </select>
     
     <select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
@@ -654,7 +681,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endDate!=null">and DATE(ssp.createtime) &lt;= DATE(#{endDate})</if>
         <if test="projectId &gt; 0"> and ssp.projectId=#{projectId}</if>
         <if test="deptId > 0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ssp.projectId in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -668,10 +695,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT p.infotype,p.checkState,COUNT(1) as total
         FROM smz_ssp_problemmodify p
         left join sur_project sp on p.projectId=sp.id
-        WHERE p.isDel=0 and sp.progressVisible=0 and sp.isDel=0
+        WHERE p.isDel=0 and sp.isDel=0
         <if test="projectId &gt; 0"> and p.projectId=#{projectId}</if>
         <if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and p.projectId in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -682,10 +709,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
         select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data  ad
         left join sur_project sp on ad.project_id=sp.id
-        where  sp.progressVisible=0 and sp.isDel=0
+        where sp.isDel=0
         <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
         <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ad.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -693,6 +720,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         and ad.is_del=0
+        UNION ALL
+        select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info  fli1
+        left join sur_project sp on fli1.project_id=sp.id
+        where fli1.is_del=0 and fli1.approve_status='100'
+        <if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and fli1.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by fli1.approve_status
     </select>
 
     <select id="countTimeout" parameterType="SmzSspProblemmodifyWhere"  resultType="Integer">

yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml

@@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
-        <result property="vDel"    column="v_del"    />
         <result property="trainNatureName"    column="train_nature_name"    />
         <result property="dataType"    column="data_type"    />
         <result property="dataTypeName"    column="data_type_name"    />