Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

ruoyi-admin/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: druid
   # 文件上传
   servlet:
     multipart:

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

@@ -13,8 +13,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="分包单位类型" prop="companyTypeId">
+      <el-form-item label="分包商类型" prop="companyTypeId">
-        <el-select v-model="queryParams.companyTypeId" placeholder="请选择分包单位类型" clearable>
+        <el-select v-model="queryParams.companyTypeId" placeholder="请选择分包商类型" clearable>
           <el-option value="0" label="所有"></el-option>
           <el-option value="101" label="总包人员"></el-option>
           <el-option value="102" label="监理人员"></el-option>
@@ -24,6 +24,12 @@
       <el-form-item label="日期" prop="createBy">
         <el-date-picker v-model="queryParams.attendanceTime" :picker-options="disableTime" type="date" placeholder="选择日期">
         </el-date-picker>
+        -
+        <el-date-picker v-model="queryParams.attendanceOutTime" :picker-options="disableTime" type="date" placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="姓名" prop="workerName">
+        <el-input v-model="queryParams.workerName" placeholder="请输入姓名"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -68,23 +74,23 @@
       <el-table-column label="性别" align="center" prop="attendanceType" >
         <template slot-scope="{row}">{{ row.workerGender==1?'女':'男' }}</template>
       </el-table-column>
-      <el-table-column label="进场时间" align="center" prop="inTime">
+      <el-table-column label="进场时间" align="center" prop="inTime"  width="96">
         <template slot-scope="{row}">
          <span v-if="row.attendanceTime">
-          {{ row.attendanceTime|formatTime }}
+          {{ row.attendanceTime|formatDateTime }}
         </span>
         <i v-else class="el-icon-close" style="color:red;"></i>
         </template>
       </el-table-column>
-      <el-table-column label="离场时间" align="center" prop="outTime">
+      <el-table-column label="离场时间" align="center" prop="outTime" width="96">
         <template slot-scope="{row}">
           <span v-if="row.attendanceOutTime">
-           {{ row.attendanceOutTime|formatTime }}
+           {{ row.attendanceOutTime|formatDateTime }}
         </span>
         <i v-else class="el-icon-close" style="color:red;"></i>
         </template>
       </el-table-column>      
-      <el-table-column label="分包单位名称" align="center" prop="companyName" />      
+      <el-table-column label="分包商名称" align="center" prop="companyName" />      
       <el-table-column label="所属班组" align="center" prop="groupName" />
       <el-table-column label="工种" align="center" prop="workTypeName" />
       
@@ -176,9 +182,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId:null,
+        workerName:'',
         deptId:null,
         companyTypeId:"0",
-        attendanceTime:new Date()
+        attendanceTime:new Date(),
+        attendanceOutTime:undefined
       },
       // 表单参数
       form: {},
@@ -251,10 +259,15 @@ export default {
       this.$refs.attDrawer.show();
     },
     /** 查询劳务实名制管理列表 */
-    getList() {      
+    getList() {
       this.loading = true;     
       let postData={};
-      postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD");
+      if(this.queryParams.attendanceTime){
+        postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD");
+      }
+      if(this.queryParams.attendanceOutTime){
+        postData.attendanceOutTime=this.$dt(this.queryParams.attendanceOutTime).format("YYYY-MM-DD");
+      }
       let tmps=this.cfgList.filter(d=>d.projectId==this.queryParams.projectId && d.subDeptId==this.queryParams.deptId);
       if(tmps.length>0){
         postData.cfgid=tmps[0].id;
@@ -264,6 +277,9 @@ export default {
       }
       postData.pageNum=this.queryParams.pageNum;
       postData.pageSize=this.queryParams.pageSize;
+      if(this.queryParams.workerName){
+        postData.workerName=this.queryParams.workerName;
+      }
       if(this.queryParams.companyTypeId && this.queryParams.companyTypeId>0){
         postData.companyTypeId=this.queryParams.companyTypeId;
       }

ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue

@@ -604,7 +604,7 @@ export default {
     },
     /** 下载附件 */
     handleDownload(row) {
-      this.files = row.measureFiles.split(",");
+      this.files = row.detectionFile.split(",");
       this.files.forEach((item) => {
         this.$download.resource(item);
       });

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

@@ -172,7 +172,7 @@
       <el-table-column label="检测报告" align="center" prop="updateTime" width="80">
         <template slot-scope="scope">
           <el-button v-if="scope.row.checkState == '2'" size="mini" type="text" icon="el-icon-paperclip"
-            @click="handledownload(scope.row)" v-hasPermi="['project:surProjectSpecial:list']">下载检测报告</el-button>
+            @click="doDown(scope.row)" v-hasPermi="['project:surProjectSpecial:list']">下载检测报告</el-button>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
@@ -481,6 +481,12 @@ export default {
     this.getList();
   },
   methods: {
+    doDown(row){
+      this.files = row.detectionFile.split(",");
+      this.files.forEach((item) => {
+        this.$download.resource(item);
+      });
+    },
     fileInput(files) {
       let fileUrls = "";
       if (files.length > 0) {
@@ -681,14 +687,7 @@ export default {
           }
         });
       });
-    },
+    },   
-    /** 下载附件 */
-    handleDownload(row) {
-      this.files = row.measureFiles.split(",");
-      this.files.forEach((item) => {
-        this.$download.resource(item);
-      });
-    },
     /** 审批日志 */
     handleAuditinfo(row) {
       row.title = "材料取样复试";

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

@@ -108,7 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
             <if test="serverid != null "> and serverid = #{serverid}</if>
             <if test="workerId != null "> and workerId = #{workerId}</if>
-            <if test="attendanceTime != null  and attendanceTime != ''"> and ( date(attendance_time) =date(#{attendanceTime}) or   date(attendance_out_time) =date(#{attendanceTime}))</if>
+            <if test="attendanceOutTime!=null and  attendanceOutTime!=''">
+              and  date(attendance_out_time) &lt;=date(#{attendanceOutTime})
+            </if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) &gt;= date(#{attendanceTime})</if>
             <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
             <if test="teamId != null "> and teamId = #{teamId}</if>
             <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
@@ -132,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vendorId != null "> and vendorId = #{vendorId}</if>            
             <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>            
             <if test="scanPhoto != null  and scanPhoto != ''"> and scanPhoto like concat('%', #{scanPhoto}, '%')</if>
+            <if test="workerName != null  and workerName != ''"> and workerName like concat('%', #{workerName}, '%')</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
         </where>
         order by attendance_time desc

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

@@ -120,10 +120,7 @@
         </foreach>
     </delete>
     <select id="groupByType" parameterType="SurProjectStandard" resultMap="com.ruoyi.system.mapper.SysDictDataMapper.SysDictDataResult">
-        select b.dict_value,b.dict_label,a.cnt STATUS from (
+        select left(a.standard_type ,1) dict_label,count(1) STATUS
-        select * from sys_dict_data where  dict_type='prj_standard_type') b
-            left join (
-        select a.standard_type,count(1) cnt
         from sur_project_standard a ,sur_project sp
         where a.is_del =0 and a.project_id=sp.id and sp.progressVisible=0
         <if test="projectId!=null and projectId>0"> and a.project_id=#{projectId}</if>
@@ -137,8 +134,8 @@
                 #{item}
             </foreach>
         </if>
-        group by a.standard_type ) a on b.dict_value=a.standard_type
+        group by left(a.standard_type ,1)
-        order by b.dict_value
+        order by left(a.standard_type ,1)
     </select>
 
     <select id="groupByProject"   resultMap="SurProjectStandardResult">
@@ -165,6 +162,6 @@
                 #{item}
             </foreach>
         </if>
-        <if test="standardType!=null and standardType>0"> and sps.standard_type=#{standardType}</if>
+        <if test="standardType!=null and standardType>0"> and sps.standard_type like concat('', #{standardType}, '%')</if>
     </select>
 </mapper>