diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProCostOutputMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProCostOutputMapper.xml
index 17f5cce6..c21ef8e9 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProCostOutputMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProCostOutputMapper.xml
@@ -347,32 +347,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="groupBYProject" parameterType="ProCostOutput" resultMap="ProCostOutputResult">
         select  x.id,x.remark,x.money,y.money money2,x.month from (
         select a.dict_value id,  a.dict_label remark,sum(b.money) money,count(a.id) month ,'总投资' cost_type from (                                                                                                                                                           SELECT a.id,c.dict_label,c.dict_value
-        FROM sur_project a,sys_dict_data c
-        where a.isDel=0
+        FROM pro_project_info a,sys_dict_data c
+        where a.is_Del=0
         <if test="costType==1">
-            and a.projectType=c.dict_value and c.dict_type='project_category'
+            and a.project_type=c.dict_value and c.dict_type='project_category'
         </if>
         <if test="costType==2">
-            and a.projiectLevel=c.dict_value and c.dict_type='project_level'
+            and a.project_level=c.dict_value and c.dict_type='project_level'
         </if>
         <if test="id!=null and id>0"> and a.deptId = #{id}</if>
         ) a
-        left join (select  project_id,money from sur_project_cost_output where cost_type=1) b on a.id=b.project_id
+        left join (select  project_id,money from pro_cost_output where cost_type=1) b on a.id=b.project_id
         group by a.dict_value,a.dict_label ) x,
         (
         select a.dict_value id,  a.dict_label remark,sum(b.money) money,count(a.id) month ,'年度' cost_type from (
         SELECT a.id,c.dict_label,c.dict_value
-        FROM sur_project a,sys_dict_data c
-        where a.isDel=0
+        FROM pro_project_info a,sys_dict_data c
+        where a.is_Del=0
         <if test="costType==1">
-            and a.projectType=c.dict_value and c.dict_type='project_category'
+            and a.project_type=c.dict_value and c.dict_type='project_category'
         </if>
         <if test="costType==2">
-            and a.projiectLevel=c.dict_value and c.dict_type='project_level'
+            and a.project_level=c.dict_value and c.dict_type='project_level'
         </if>
         <if test="id!=null and id>0"> and a.deptId = #{id}</if>
         ) a
-        left join (select  project_id,money from sur_project_cost_output where cost_type=2 and year=#{year}) b on a.id=b.project_id
+        left join (select  project_id,money from pro_cost_output where cost_type=2 and year=#{year}) b on a.id=b.project_id
         group by a.dict_value,a.dict_label
         )y where x.id=y.id
     </select>
diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
index 6760218a..4163d2da 100644
--- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
+++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
@@ -425,7 +425,7 @@ public class AttendanceJgwTask {
         String filePath= resourcesConfig.getUploadPath();
         try {
             String name=FileUtil.getName(photo);
-           return "/jgw"+FileUtils.writeBytes(buffer, filePath+"/jgw",name);
+           return "/jgw/"+FileUtils.writeBytes(buffer, filePath+"/jgw",name);
         }catch (Exception ex){
             return  "";
         }
@@ -827,7 +827,7 @@ public class AttendanceJgwTask {
     private void doSyncWorker(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) {
         String appId=jo.getString("appId");
         String token=jo.getString("token");
-        String projectId=jo.getString("projectId");
+        String projectId=jo.getString("appProjectId");
         String path="/webapi/project/findAddWorkerByProject";
         String time = System.currentTimeMillis() + "";
         String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
@@ -913,7 +913,7 @@ public class AttendanceJgwTask {
     private void doSyncProContractor(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) {
         String appId=jo.getString("appId");
         String token=jo.getString("token");
-        String projectId=jo.getString("projectId");
+        String projectId=jo.getString("appProjectId");
         String path="/webapi/project/findProContractorByProjectId";
         String time = System.currentTimeMillis() + "";
         String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
@@ -972,7 +972,7 @@ public class AttendanceJgwTask {
     private void doSyncDirectlyUnderGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) {
         String appId=jo.getString("appId");
         String token=jo.getString("token");
-        String projectId=jo.getString("projectId");
+        String projectId=jo.getString("appProjectId");
         String phone=jo.getString("phone");
         String subcontractorId=getSubcontractor(appId,token,phone);
         String path="/webapi/project/findDirectlyUnderTeam";
@@ -1031,7 +1031,7 @@ public class AttendanceJgwTask {
     private void doSyncGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) {
         String appId=jo.getString("appId");
         String token=jo.getString("token");
-        String projectId=jo.getString("projectId");
+        String projectId=jo.getString("appProjectId");
         String path="/webapi/project/findTeamByProjectId";
         String time = System.currentTimeMillis() + "";
         String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
@@ -1134,7 +1134,7 @@ public class AttendanceJgwTask {
     private void doSyncAttendanceData(JSONObject jo, String startId, QuartzProjectAttendanceCfg it) {
         String appId=jo.getString("appId");
         String token=jo.getString("token");
-        String projectId=jo.getString("projectId");
+        String projectId=jo.getString("appProjectId");
         String startTime=jo.getString("startTime");
         String endTime=jo.getString("endTime");
         String path="/webapi/project/findAttendanceByProject";
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceDataMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceDataMapper.xml
index 4dca9357..97b29be6 100644
--- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceDataMapper.xml
+++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceDataMapper.xml
@@ -409,6 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="subDeptId!=null and subDeptId>0">
             and sp.dis_dept_id=#{subDeptId}
         </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.project_Type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and c.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -451,7 +452,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="todayAttendance" parameterType="QuartzProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
         select ady.* from sur_project_attendance_data_${year} ady
-        left join sur_project sp on sp.id = ady.projectId
+        left join pro_project_info sp on sp.id = ady.projectId
         where sp.is_Del=0
             <if test="projectId!=null and projectId>0">
                 and ady.projectId=#{projectId}
@@ -468,6 +469,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId!=null and deptId>0">
                 and sp.dis_dept_id=#{deptId}
             </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.project_Type = #{proType}</if>
             <if test="prjIds !=null and prjIds.size()>0">
                 and ady.projectId in
                 <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -503,14 +505,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectId!=null and projectId>0">
             and projectId=#{projectId}
         </if>
-        and projectId in (select id from sur_project sp where sp.isDel=0
+        and projectId in (select id from pro_project_info sp where sp.is_Del=0
 
         <if test="deptId!=null and deptId>0">
-            and sp.deptId=#{deptId}
+            and sp.dis_dept_id=#{deptId}
         </if>
         <if test="attendanceTime != null  and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
 
-        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.project_type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and ady.projectId in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml
index 1541e4d7..7f1de729 100644
--- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml
+++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml
@@ -507,7 +507,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and c.project_id=#{projectId}
         </if>
         <if test="deptId!=null and deptId>0">
-            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId})
+            and  c.project_id in (SELECT id FROM pro_project_info WHERE dis_dept_id=#{deptId})
         </if>
         <if test="prjIds !=null and prjIds.size()>0">
             and c.project_id in
@@ -538,7 +538,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and c.project_id=#{projectId}
         </if>
         <if test="deptId!=null and deptId>0">
-            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId})
+            and  c.project_id in (SELECT id FROM pro_project_info WHERE dis_dept_id=#{deptId})
         </if>
         <if test="prjIds !=null and prjIds.size()>0">
             and c.project_id in
@@ -595,7 +595,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId!=null and deptId>0">
             and sp.dis_dept_id=#{deptId}
         </if>
-
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.project_Type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and b.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -641,7 +641,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId!=null and deptId>0">
             and p.dis_dept_id=#{deptId}
         </if>
-        <if test='proType != null and proType != "" and proType != "0"'> and p.projectType = #{proType}</if>
+        <if test='proType != null and proType != "" and proType != "0"'> and p.project_Type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and b.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -691,6 +691,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId!=null and deptId>0">
             and p.dis_dept_id=#{deptId}
         </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and p.project_Type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and b.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@@ -726,6 +727,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId!=null and deptId>0">
             and sp.dis_dept_id=#{deptId}
         </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.project_Type = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and b.project_id in
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml
index 7bf8280c..37baad0f 100644
--- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml
+++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml
@@ -24,8 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysApplyConfigVo">
-        select sac.id, sac.cfg_type, sac.cfg_id, sac.app_id, sac.public_key, sac.private_key, sac.project_id, sp.projectName, sac.dept_id, sd.dept_name as deptName, sac.is_del, sac.create_by, sac.create_time, sac.update_by, sac.update_time, sac.remark from sys_apply_config sac
-        left join sur_project sp on sac.project_id = sp.id
+        select sac.id, sac.cfg_type, sac.cfg_id, sac.app_id, sac.public_key, sac.private_key, sac.project_id, sp.project_name, sac.dept_id, sd.dept_name as deptName, sac.is_del, sac.create_by, sac.create_time, sac.update_by, sac.update_time, sac.remark from sys_apply_config sac
+        left join pro_project_info sp on sac.project_id = sp.id
         left join sys_dept sd on sac.dept_id = sd.dept_id
     </sql>
 
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null "> and sac.cfg_id = #{cfgId}</if>
             <if test="cfgType != null "> and sac.cfg_type = #{cfgType}</if>
             <if test="appId != null "> and sac.app_id like concat('%', #{appId}, '%')</if>
-            <if test="projectName != null "> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="projectName != null "> and sp.project_name like concat('%', #{projectName}, '%')</if>
             <if test="deptName != null "> and sd.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="isDel != null  and isDel != ''"> and sac.is_del = #{isDel}</if>
         </where>
diff --git a/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue b/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue
index 224d6fd6..d7b9bbce 100644
--- a/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue
@@ -89,14 +89,14 @@
 
         <!-- 添加或修改考勤配置对话框 -->
         <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
-            <el-form ref="attendance_cfgRef" :model="form" :rules="rules" label-width="100px" :key="data.formKey">
+            <el-form ref="attendance_cfgRef" :model="form" :rules="rules" label-width="120px" :key="data.formKey">
                 <el-form-item label="所属项目" prop="projectId">
-                    <el-select :disabled="data.currentPrjId != ''||data.mode=='edit'" v-model="form.projectId" placeholder="请选择项目">
+                    <el-select :disabled="data.currentPrjId != ''||data.mode=='edit'" v-model="form.projectId" placeholder="请选择项目" style="width:300px;">
                         <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="考勤厂商" prop="vendorsCode">
-                    <el-select v-model="form.vendorsCode" placeholder="请选择厂商" @change="vendorsCodeChange">
+                    <el-select v-model="form.vendorsCode" placeholder="请选择厂商" @change="vendorsCodeChange" :disabled="data.mode=='edit'">
                         <el-option v-for="dict in attendance_vendors" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
@@ -123,6 +123,12 @@
                     </el-form-item>
                 </template>
 
+                <template v-if="form.vendorsCode=='jgw'">
+                    <el-form-item label="项目经理手机" prop="phone">
+                        <el-input v-model="form.phone" placeholder="项目经理手机" clearable />
+                    </el-form-item>
+                </template>
+
                 <el-form-item label="已启用" prop="enabled">
                     <el-switch v-model="form.enabled" :active-value="1" :inactive-value="0" />
                 </el-form-item>