sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-04-09 22:22:23 +08:00
parent b7369b07cc
commit e7a6e0309f
3 changed files with 81 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-ui/src/views/project/attendanceWorker/index.vue
View File

@ -1,8 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="position: relative;"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px"
style="position: relative;">
<el-form-item label="项目名称" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-select :disabled="prjDisabled" v-model="queryParams.projectId" placeholder="请选择项目" clearable @change="doQuerySub()"> <el-select :disabled="prjDisabled" v-model="queryParams.projectId" placeholder="请选择项目" clearable
@change="doQuerySub()">
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id"> <el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
@ -13,7 +15,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="分包商类型" prop="companyTypeId">
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包商类型" clearable>
<el-option value="" label="所有"></el-option>
<el-option value="101" label="总包人员"></el-option>
<el-option value="102" label="监理人员"></el-option>
<el-option value="103" label="劳务人员"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="state"> <el-form-item label="" prop="state">
<el-radio-group v-model="queryParams.state" size="mini"> <el-radio-group v-model="queryParams.state" size="mini">
<el-radio-button label="">全部人员</el-radio-button> <el-radio-button label="">全部人员</el-radio-button>
@ -108,6 +117,7 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
companyTypeId:"",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
projectId: null, projectId: null,

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
View File

@ -22,6 +22,7 @@ public class SurProjectAttendanceUser extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** */ /** */
private Long id; private Long id;

22
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -104,8 +104,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDel != null "> and u.is_del = #{isDel}</if> <if test="isDel != null "> and u.is_del = #{isDel}</if>
</select> </select>
<select id="selectSurProjectAttendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult"> <select id="selectSurProjectAttendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
<include refid="selectSurProjectAttendanceUserVo"/> SELECT * FROM (
SELECT a.*,b.project_id,b.sub_dept_id,g.companyTypeId
FROM sur_project_attendance_user a,sur_project_attendance_cfg b,sur_project_attendance_group g
WHERE a.cfgid=b.id and a.companyId=g.companyId)
sur_project_attendance_user
<where> <where>
<if test="companyTypeId!=null">
<if test="companyTypeId>100">
<if test="companyTypeId==101">
and companyTypeId in (1,6)
</if>
<if test="companyTypeId==102">
and companyTypeId =8
</if>
<if test="companyTypeId==103">
and companyTypeId in (0,2,3,4,5)
</if>
</if>
<if test="companyTypeId &lt;100">
and companyTypeId=#{companyTypeId}
</if>
</if>
<if test="cfgid != null "> and cfgid = #{cfgid}</if> <if test="cfgid != null "> and cfgid = #{cfgid}</if>
<if test="appId != null "> and app_id = #{appId}</if> <if test="appId != null "> and app_id = #{appId}</if>
<if test="vendorsCode != null and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if> <if test="vendorsCode != null and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>