Skip to content

A
attendance-performance-platform
Commit f1fa08e9 authored by daijunxiong's avatar daijunxiong
Browse files
Options

新增下拉 关联负责人新增 修改test文件

parent 12c74a4a
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 79 deletions
attendance-performance-manager/pom.xml
View file @ f1fa08e9
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov-dev</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<package.environment>test</package.environment> <package.environment>test</package.environment>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<groupId>com.hikvision.ga</groupId> <groupId>com.hikvision.ga</groupId>
<artifactId>artemis-http-client</artifactId> <artifactId>artemis-http-client</artifactId>
<version>1.1.8</version> <version>1.1.8</version>
<!--<systemPath>${project.basedir}/src/main/resources/lib/artemis-http-client-1.1.8.jar</systemPath>--> <!-- <systemPath>${project.basedir}/src/main/resources/lib/artemis-http-client-1.1.8.jar</systemPath>-->
</dependency> </dependency>
<dependency> <dependency>
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java
View file @ f1fa08e9
...@@ -26,4 +26,9 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{ ...@@ -26,4 +26,9 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{
* */ * */
List<DeptEntity> queryAllList(); List<DeptEntity> queryAllList();
/**
* 统计部门人数
* */
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java
View file @ f1fa08e9
...@@ -24,7 +24,6 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements ...@@ -24,7 +24,6 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
@Override @Override
public List<DeptEntity> queryAllList() { public List<DeptEntity> queryAllList() {
return this.getList(new DeptEntity()); return this.getList(new DeptEntity());
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptVo.java
View file @ f1fa08e9
...@@ -16,4 +16,7 @@ public class DeptVo extends BaseEntityLong { ...@@ -16,4 +16,7 @@ public class DeptVo extends BaseEntityLong {
/** 子部门信息 */ /** 子部门信息 */
private List<DeptEntity> children = new ArrayList<>(); private List<DeptEntity> children = new ArrayList<>();
//成员数量
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
View file @ f1fa08e9
package com.mortals.xhx.module.dept.web; package com.mortals.xhx.module.dept.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.alibaba.fastjson.JSONObject;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.framework.exception.AppException;
import com.mortals.xhx.module.dept.model.DeptQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.model.DeptTreeSelect; import com.mortals.xhx.module.dept.model.DeptTreeSelect;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.workman.model.WorkmanQuery;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* 部门信息 * 部门信息
...@@ -47,6 +37,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -47,6 +37,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
private ParamService paramService; private ParamService paramService;
@Autowired @Autowired
private DeptService deptService; private DeptService deptService;
@Autowired
private WorkmanService workmanService;
public DeptController() { public DeptController() {
...@@ -56,7 +48,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -56,7 +48,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "deptStatus", paramService.getParamBySecondOrganize("Dept", "deptStatus")); this.addDict(model, "deptStatus", paramService.getParamBySecondOrganize("Dept", "deptStatus"));
this.addDict(model, "id", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
this.addDict(model, "remark", workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
super.init(model, context); super.init(model, context);
} }
...@@ -134,4 +127,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -134,4 +127,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
} }
@Override
protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
return super.doListAfter(query, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java
View file @ f1fa08e9
...@@ -51,4 +51,9 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{ ...@@ -51,4 +51,9 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{
* 兼职 * 兼职
* */ * */
int queryConcurrently(); int queryConcurrently();
/**
* 查询职位
* */
List<StaffEntity> queryDetp();
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java
View file @ f1fa08e9
...@@ -53,4 +53,11 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement ...@@ -53,4 +53,11 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement
return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently")); return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently"));
} }
@Override
public List<StaffEntity> queryDetp(){
return this.getSqlSession().selectList(this.getSqlId("queryDetp"));
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffInfoVo.java
View file @ f1fa08e9
...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.model.vo; ...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.model.vo;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
public class StaffInfoVo { public class StaffInfoVo {
...@@ -19,4 +21,7 @@ public class StaffInfoVo { ...@@ -19,4 +21,7 @@ public class StaffInfoVo {
private Integer resignationStaff; private Integer resignationStaff;
//兼职 //兼职
private Integer concurrentlyStaff; private Integer concurrentlyStaff;
//刷新时间
private Date refreshDate;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
View file @ f1fa08e9
...@@ -3,6 +3,8 @@ import com.mortals.framework.service.ICRUDCacheService; ...@@ -3,6 +3,8 @@ import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.xhx.module.staff.model.StaffEntity; import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
import java.util.List;
/** /**
* StaffService * StaffService
* *
...@@ -14,4 +16,6 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; ...@@ -14,4 +16,6 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
public interface StaffService extends ICRUDCacheService<StaffEntity,Long> { public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
StaffInfoVo queryAll(); StaffInfoVo queryAll();
List<StaffEntity> queryDept();
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ f1fa08e9
...@@ -10,6 +10,8 @@ import com.mortals.xhx.module.staff.service.StaffService; ...@@ -10,6 +10,8 @@ import com.mortals.xhx.module.staff.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* StaffService * StaffService
* 员工基本信息 service实现 * 员工基本信息 service实现
...@@ -53,4 +55,10 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -53,4 +55,10 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffInfoVo.setResignationStaff(staffLeaveDao.queryResignation()); staffInfoVo.setResignationStaff(staffLeaveDao.queryResignation());
return staffInfoVo; return staffInfoVo;
} }
@Override
public List<StaffEntity> queryDept() {
return staffDao.queryDetp();
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ f1fa08e9
...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -59,6 +60,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -59,6 +60,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException { protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
//todo 员工信息统计--员工关系统计 //todo 员工信息统计--员工关系统计
StaffInfoVo staffInfoVo = this.service.queryAll(); StaffInfoVo staffInfoVo = this.service.queryAll();
staffInfoVo.setRefreshDate(new Date());
model.put("staff", staffInfoVo); model.put("staff", staffInfoVo);
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
} }
...@@ -94,4 +96,13 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -94,4 +96,13 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
return super.infoAfter(id, model, entity, context); return super.infoAfter(id, model, entity, context);
} }
@Override
protected int saveAfter(StaffEntity entity, Map<String, Object> model, Context context) throws AppException {
return super.saveAfter(entity, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ f1fa08e9
package com.mortals.xhx.module.workman.web; package com.mortals.xhx.module.workman.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* *
* 工作人员 * 工作人员
...@@ -36,14 +29,25 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -36,14 +29,25 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private DeptService deptService;
public WorkmanController(){ public WorkmanController(){
super.setModuleDesc( "工作人员"); super.setModuleDesc( "工作人员");
} }
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "positionId",deptService .find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
super.init(model, context); super.init(model, context);
} }
@Override
protected int saveAfter(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
DeptEntity deptEntity = new DeptEntity();
deptEntity.setRemark(entity.getName());
return super.saveAfter(entity, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ f1fa08e9
...@@ -1337,4 +1337,7 @@ ...@@ -1337,4 +1337,7 @@
select count(1) pricateStaff from mortals_xhx_staff where staffType = 3 select count(1) pricateStaff from mortals_xhx_staff where staffType = 3
</select> </select>
<select id="queryDetp" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
select deptName from mortals_xhx_staff group by deptName
</select>
</mapper> </mapper>
\ No newline at end of file
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceClassController.http
View file @ f1fa08e9
...@@ -33,7 +33,7 @@ Content-Type: application/json ...@@ -33,7 +33,7 @@ Content-Type: application/json
"className":"rkd3tw", "className":"rkd3tw",
"classResponsiblePersonId":291, "classResponsiblePersonId":291,
"classResponsiblePersonName":"mbga7i", "classResponsiblePersonName":"mbga7i",
"remark":"l73cn1", "remark":"l73cn1"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceClassDetailController.http
View file @ f1fa08e9
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"offWorkDate":"1680883200000", "offWorkDate":"1680883200000",
"offWorkDateBefore":558, "offWorkDateBefore":558,
"offWorkDateAfter":772, "offWorkDateAfter":772,
"remark":"38en8a", "remark":"38en8a"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFixedworkController.http
View file @ f1fa08e9
...@@ -54,7 +54,7 @@ Content-Type: application/json ...@@ -54,7 +54,7 @@ Content-Type: application/json
"sundayClassId":546, "sundayClassId":546,
"sundayClassName":"uq3lhu", "sundayClassName":"uq3lhu",
"holidays":1, "holidays":1,
"remark":"u6z76o", "remark":"u6z76o"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFixedworkSpecialController.http
View file @ f1fa08e9
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"specialTime":"1680883200000", "specialTime":"1680883200000",
"specialTimeStart":"1680883200000", "specialTimeStart":"1680883200000",
"specialTimeEnd":"1680883200000", "specialTimeEnd":"1680883200000",
"remark":"eun5vs", "remark":"eun5vs"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFreeworkController.http
View file @ f1fa08e9
...@@ -41,7 +41,7 @@ Content-Type: application/json ...@@ -41,7 +41,7 @@ Content-Type: application/json
"sunday":0, "sunday":0,
"holidays":1, "holidays":1,
"workTime":0, "workTime":0,
"remark":"pbndzz", "remark":"pbndzz"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFreeworkSpecialController.http
View file @ f1fa08e9
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"specialTime":"1680883200000", "specialTime":"1680883200000",
"specialTimeStart":"1680883200000", "specialTimeStart":"1680883200000",
"specialTimeEnd":"1680883200000", "specialTimeEnd":"1680883200000",
"remark":"482xif", "remark":"482xif"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupResponsibleController.http
View file @ f1fa08e9
...@@ -36,7 +36,7 @@ Content-Type: application/json ...@@ -36,7 +36,7 @@ Content-Type: application/json
"responsibleId":395, "responsibleId":395,
"responsibleName":"uwo4fh", "responsibleName":"uwo4fh",
"responsibleType":768, "responsibleType":768,
"remark":"y4pguf", "remark":"y4pguf"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupStaffController.http
View file @ f1fa08e9
...@@ -36,7 +36,7 @@ Content-Type: application/json ...@@ -36,7 +36,7 @@ Content-Type: application/json
"staffId":289, "staffId":289,
"staffName":"s1l6xv", "staffName":"s1l6xv",
"partAttendance":82, "partAttendance":82,
"remark":"jjogmm", "remark":"jjogmm"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceLeaveRecordController.http
View file @ f1fa08e9
...@@ -50,7 +50,7 @@ Content-Type: application/json ...@@ -50,7 +50,7 @@ Content-Type: application/json
"approver":"7ihkp2", "approver":"7ihkp2",
"attachment":"3ho9of", "attachment":"3ho9of",
"attachmentPath":"p9ovhu", "attachmentPath":"p9ovhu",
"remark":"uxsqrs", "remark":"uxsqrs"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordController.http
View file @ f1fa08e9
...@@ -43,7 +43,7 @@ Content-Type: application/json ...@@ -43,7 +43,7 @@ Content-Type: application/json
"shiftsId":439, "shiftsId":439,
"shiftsName":"1zzktm", "shiftsName":"1zzktm",
"attendanceDate":"1680796800000", "attendanceDate":"1680796800000",
"remark":"0rlbnv", "remark":"0rlbnv"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordDetailController.http
View file @ f1fa08e9
...@@ -37,7 +37,7 @@ Content-Type: application/json ...@@ -37,7 +37,7 @@ Content-Type: application/json
"goWorkResult":642, "goWorkResult":642,
"offWorkDate":"1680796800000", "offWorkDate":"1680796800000",
"offWorkResult":656, "offWorkResult":656,
"remark":"h0anyu", "remark":"h0anyu"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordErrorController.http
View file @ f1fa08e9
...@@ -53,7 +53,7 @@ Content-Type: application/json ...@@ -53,7 +53,7 @@ Content-Type: application/json
"errorStatus":0, "errorStatus":0,
"processStatus":0, "processStatus":0,
"processResult":"s1gyfc", "processResult":"s1gyfc",
"remark":"4t1f2x", "remark":"4t1f2x"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordHikController.http
View file @ f1fa08e9
...@@ -48,7 +48,7 @@ Content-Type: application/json ...@@ -48,7 +48,7 @@ Content-Type: application/json
"attendanceDate":"1680883200000", "attendanceDate":"1680883200000",
"attendanceAddress":"zta8r5", "attendanceAddress":"zta8r5",
"eventSource":"42l4jh", "eventSource":"42l4jh",
"remark":"ftcbb3", "remark":"ftcbb3"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceStaffStatController.http
View file @ f1fa08e9
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"year":269, "year":269,
"month":903, "month":903,
"day":431, "day":431,
"remark":"4e0w24", "remark":"4e0w24"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceStatController.http
View file @ f1fa08e9
...@@ -95,7 +95,7 @@ Content-Type: application/json ...@@ -95,7 +95,7 @@ Content-Type: application/json
"year":593, "year":593,
"month":333, "month":333,
"day":983, "day":983,
"remark":"no1wds", "remark":"no1wds"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceVacationBalanceController.http
View file @ f1fa08e9
...@@ -50,7 +50,7 @@ Content-Type: application/json ...@@ -50,7 +50,7 @@ Content-Type: application/json
"sickLeaveDays":0, "sickLeaveDays":0,
"annualLeaveDays":0, "annualLeaveDays":0,
"marriageLeaveDays":0, "marriageLeaveDays":0,
"remark":"rmgjgc", "remark":"rmgjgc"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/care/CareTemplateController.http
View file @ f1fa08e9
...@@ -34,7 +34,7 @@ Content-Type: application/json ...@@ -34,7 +34,7 @@ Content-Type: application/json
{ {
"careType":1, "careType":1,
"sms":1, "sms":1,
"smsTemplate":"ukqfvp", "smsTemplate":"ukqfvp"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http
View file @ f1fa08e9
...@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token); ...@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
%} %}
###职位信息列表 ###职位信息列表
POST {{baseUrl}}/job/list POST {{baseUrl}}/dept/list
Authorization: {{authToken}} Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
...@@ -25,7 +25,7 @@ Content-Type: application/json ...@@ -25,7 +25,7 @@ Content-Type: application/json
###职位信息更新与保存 ###职位信息更新与保存
POST {{baseUrl}}/job/save POST {{baseUrl}}/dept/save
Authorization: {{authToken}} Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
...@@ -34,26 +34,26 @@ Content-Type: application/json ...@@ -34,26 +34,26 @@ Content-Type: application/json
"groupName":"2g2sug", "groupName":"2g2sug",
"jobCode":"p0m3o4", "jobCode":"p0m3o4",
"jobName":"3dnfdt", "jobName":"3dnfdt",
"remark":"brj4yu", "remark":"brj4yu"
} }
> {% > {%
client.global.set("Job_id", JSON.parse(response.body).data.id); client.global.set("Dept_id", JSON.parse(response.body).data.id);
%} %}
###职位信息查看 ###职位信息查看
GET {{baseUrl}}/job/info?id={{Job_id}} GET {{baseUrl}}/dept/info?id=1
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
###职位信息编辑 ###职位信息编辑
GET {{baseUrl}}/job/edit?id={{Job_id}} GET {{baseUrl}}/dept/edit?id={{Job_id}}
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
###职位信息删除 ###职位信息删除
GET {{baseUrl}}/job/delete?id={{Job_id}} GET {{baseUrl}}/dept/delete?id={{Job_id}}
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/job/JobController.http
View file @ f1fa08e9
...@@ -37,7 +37,7 @@ Content-Type: application/json ...@@ -37,7 +37,7 @@ Content-Type: application/json
"groupName":"2g2sug", "groupName":"2g2sug",
"jobCode":"p0m3o4", "jobCode":"p0m3o4",
"jobName":"3dnfdt", "jobName":"3dnfdt",
"remark":"brj4yu", "remark":"brj4yu"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffAdjustLogController.http
View file @ f1fa08e9
...@@ -56,7 +56,7 @@ Content-Type: application/json ...@@ -56,7 +56,7 @@ Content-Type: application/json
"newDeptName":"vg2kiw", "newDeptName":"vg2kiw",
"newJobId":149, "newJobId":149,
"newJobName":"fxbleu", "newJobName":"fxbleu",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffBlackController.http
View file @ f1fa08e9
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"leaveDate":"1680796800000", "leaveDate":"1680796800000",
"leaveReason":"njhiuz", "leaveReason":"njhiuz",
"blackDate":"1680796800000", "blackDate":"1680796800000",
"blackReason":"2le6y8", "blackReason":"2le6y8"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffCareController.http
View file @ f1fa08e9
...@@ -43,7 +43,7 @@ Content-Type: application/json ...@@ -43,7 +43,7 @@ Content-Type: application/json
"entryDate":"1680796800000", "entryDate":"1680796800000",
"careType":1, "careType":1,
"sendStatus":0, "sendStatus":0,
"content":"yaqglc", "content":"yaqglc"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffContractController.http
View file @ f1fa08e9
...@@ -59,7 +59,7 @@ Content-Type: application/json ...@@ -59,7 +59,7 @@ Content-Type: application/json
"contractType":1, "contractType":1,
"newStartDate":"1680796800000", "newStartDate":"1680796800000",
"newEndDate":"1680796800000", "newEndDate":"1680796800000",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffLeaveController.http
View file @ f1fa08e9
...@@ -54,7 +54,7 @@ Content-Type: application/json ...@@ -54,7 +54,7 @@ Content-Type: application/json
"entryDate":"1680796800000", "entryDate":"1680796800000",
"leaveDate":"1680796800000", "leaveDate":"1680796800000",
"leaveReason":"c7jgln", "leaveReason":"c7jgln",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffRegularController.http
View file @ f1fa08e9
...@@ -53,7 +53,7 @@ Content-Type: application/json ...@@ -53,7 +53,7 @@ Content-Type: application/json
"status":1, "status":1,
"entryDate":"1680796800000", "entryDate":"1680796800000",
"regularDate":"1680796800000", "regularDate":"1680796800000",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http
View file @ f1fa08e9
...@@ -31,12 +31,12 @@ Authorization: {{authToken}} ...@@ -31,12 +31,12 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"deptId":0, "deptId":1,
"deptName":"ovcky1", "deptName":"技术部",
"name":"rvylk9", "name":"李林琳",
"number":"d0r6u9", "number":"9527",
"phone":"otc9xw", "phone":"13088088888",
"photoPath":"yelfqx", "photoPath":"http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E7%B3%BB%E7%BB%9F%E8%AE%BE%E7%BD%AE/u11719.png"
} }
> {% > {%
...@@ -44,7 +44,7 @@ client.global.set("Workman_id", JSON.parse(response.body).data.id); ...@@ -44,7 +44,7 @@ client.global.set("Workman_id", JSON.parse(response.body).data.id);
%} %}
###工作人员查看 ###工作人员查看
GET {{baseUrl}}/workman/info?id={{Workman_id}} GET {{baseUrl}}/workman/info?id=1
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment