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

update code

dev_xds
haha 2024-04-14 23:25:20 +08:00
parent ea1a05658e
commit 1f492bc77f
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/api/project/attendanceWorker.js
View File

@ -10,6 +10,14 @@ export function listAttendanceWorker(query) {
})
}
// 查询考勤人员基本属性列表
export function queryAttendanceWorker(query) {
return request({
url: '/project/attendanceWorker/query',
method: 'get',
params: query
})
}
// 查询考勤人员基本属性列表
export function listJgwAttendanceWorker(query) {
return request({

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

@ -94,7 +94,7 @@
</template>
<script>
import { listAttendanceWorker, listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
import { queryAttendanceWorker, listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
import { listAttendanceConfig } from '@/api/project/attendanceConfig.js'
export default {
name: "AttendanceWorker",
@ -192,7 +192,7 @@ export default {
getList() {
this.loading = true;
let tmps = this.cfgList.filter(d => d.projectId == this.queryParams.projectId && d.subDeptId == this.queryParams.subDeptId);
let ajax = listAttendanceWorker;
let ajax = queryAttendanceWorker;
if (tmps.length > 0 && tmps[0].vendorsCode == 'jgw') {
ajax = listJgwAttendanceWorker;
}

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
View File

@ -160,7 +160,13 @@ public class SurProjectAttendanceGroup extends BaseEntity
g.companyCode=json.getString("companyCode");
g.companyId=""+json.getLongValue("companyId",0);
g.companyName=json.getString("companyName");
g.companyTypeId=json.getString("companyTypeId");
String typeId=json.getString("companyTypeId");
if("1".equals(typeId)||"8".equals(typeId)||"9".equals(typeId)){
typeId=typeId;
}else{
typeId="2";
}
g.companyTypeId=typeId;
g.vendorId=json.getLongValue("vendorId",0);
g.name=json.getString("name");
g.leaderName=json.getString("leaderName");

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
View File

@ -134,9 +134,9 @@ public class SurProjectAttendanceGroupServiceImpl implements ISurProjectAttendan
@Override
public void add(SurProjectAttendanceGroup group) {
SurProjectAttendanceGroup where=new SurProjectAttendanceGroup();
where.setServerid(group.getCompanyId());
where.setServerid(group.getServerid());
where.setCfgid(group.getCfgid());
List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupViewList(where);
List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupList(where);
if(list.size()==0){
insertSurProjectAttendanceGroup(group);
}else{