update code

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>
@@ -25,6 +25,9 @@
         <el-date-picker v-model="queryParams.attendanceTime" :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>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -84,7 +87,7 @@
         <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,6 +179,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId:null,
+        workerName:'',
         deptId:null,
         companyTypeId:"0",
         attendanceTime:new Date()
@@ -264,6 +268,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;
       }

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

@@ -132,6 +132,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">