Skip to content

8
8timerapiv200
Commit 344f2897 by lal
Options

Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

parents b8830327 7949e275
Showing with 173 additions and 80 deletions
src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java
......@@ -58,8 +58,11 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
@ApiModelProperty(value = "电话号码 ", example = "18712345678")
private String phone;
@ApiModelProperty(value = "所在地区", example = "广东省广州市白云区")
@ApiModelProperty(value = "所在地区id", example = "广东省广州市白云区")
private String area;
@ApiModelProperty(value = "所在地区中文", example = "广东省广州市白云区")
private String areaName;
@ApiModelProperty(value = "办公地址 ", example = "广从一路5号柏曼酒店3楼")
private String workAddress;
......
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
......@@ -121,8 +121,8 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty(value="微信 ",example="微信")
private String wechat;
@ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
private String email;
// @ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
// private String email;
@ApiModelProperty(value="血型 ",example="血型")
private String bloodType;
......
src/main/java/cn/timer/api/controller/LoginController.java
......@@ -495,6 +495,7 @@ public class LoginController {
String username = entRegisterDto.getUsername();
String name = entRegisterDto.getName();
String pw = entRegisterDto.getPw();
String email = entRegisterDto.getEmail();
if ((phone == null || StrUtil.hasBlank(phone)) || (username == null || StrUtil.hasBlank(username))
|| (name == null || StrUtil.hasBlank(name)) || (pw == null || StrUtil.hasBlank(pw))) {
......@@ -525,9 +526,8 @@ public class LoginController {
}
if (login == null) {
System.err.println("kanxia");
// 员工信息
QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw))
QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw)).email(email)
.sts(CommonEnum.U_STS_ON.getType()).orgId(qyId).regTime(DateUtil.date()).build();
boolean b2 = qyzxEmpLogin.insert();
if (!b2) {
......@@ -536,9 +536,9 @@ public class LoginController {
}
login = qyzxEmpLogin;
}
// 1-是主账号管理员
boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date()).isManager(1)
.name(username).phone(phone).jobType(YgJobType.QUANZHI.getType())
// 员工信息
boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
.name(username).phone(phone).workEmail(email).jobType(YgJobType.QUANZHI.getType())
.jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build().insert();
if (!b4) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
......@@ -581,6 +581,7 @@ public class LoginController {
System.out.println("重复初始化数据！");
}
// 绩效设置初始化
JxglBasicSetting bS = jxglService.selectAT(qyId);
if (bS == null) {
boolean res = jxglService.initJxglBasicSetting(qyId);
......
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
......@@ -623,8 +623,8 @@ public class JxglController {
* 修改-绩效管理状态
*/
@PostMapping(value = "/update_performance_appraisal_sts")
@ApiOperation(value = "8.修改-绩效管理状态", httpMethod = "POST", notes = "修改-绩效管理状态")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "9.修改-绩效管理状态", httpMethod = "POST", notes = "修改-绩效管理状态")
@ApiOperationSupport(order = 9)
public Result<Object> updatePAS(@CurrentUser UserBean userBean,
@Validated @RequestBody AppraisalUpdateSts appraisalUpdateSts) {
......@@ -644,7 +644,7 @@ public class JxglController {
.id(appraisalUpdateSts.getId())
.sts(PerformanceAppraisalSts.PERFORMANCE_ARCHIVE.getType())
.build());
return ResultUtil.success("");
return ResultUtil.success();
}
Integer sts = null;
......@@ -746,6 +746,34 @@ public class JxglController {
}
}
break;
case 3:
// 修改 考核状态
jxglAppraisalMapper.update(
JxglAppraisal.builder().performanceAppraisalId(id).sts(AppraisalSts.PERFORMANCE_ARCHIVE.getType()).build(),
new UpdateWrapper<JxglAppraisal>().lambda()
.eq(JxglAppraisal::getPerformanceAppraisalId, id)
);
List<JxglAppraisal> listAppraisal = jxglAppraisalMapper.selectList(new QueryWrapper<JxglAppraisal>().lambda()
.select(JxglAppraisal::getId)
.eq(JxglAppraisal::getPerformanceAppraisalId, performanceAppraisal.getId()));
if (CollectionUtil.isNotEmpty(listAppraisal)) {
List<Integer> aIds2 = listAppraisal.stream().map(JxglAppraisal::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(aIds2)) {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build();
aIds2.forEach(aId -> {
appraisalLog.setId(null);
appraisalLog.setAppraisalId(aId);
appraisalLog.setExecutorId(userBean.getEmpNum());
appraisalLog.setExecutorName(userBean.getUserInfo().getName());
appraisalLog.setType(AppraisalLogType.PERFORMANCE_ARCHIVE.getType());
appraisalLog.insert();
});
}
}
break;
default:
break;
}
......@@ -761,8 +789,8 @@ public class JxglController {
* 终止-绩效考核
*/
@PutMapping(value = "/termination_performance_appraisal")
@ApiOperation(value = "8.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "10.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核")
@ApiOperationSupport(order = 10)
@Role
@Log(title = "终止-绩效考核")
public Result<Object> terminationPA(@CurrentUser UserBean userBean,@NotNull @RequestParam Integer id) {
......@@ -797,8 +825,9 @@ public class JxglController {
List<Integer> aIds = listAppraisal.stream().map(JxglAppraisal::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(aIds)) {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build();
aIds.forEach(aId -> {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build();
appraisalLog.setId(null);
appraisalLog.setAppraisalId(aId);
appraisalLog.setExecutorId(userBean.getEmpNum());
appraisalLog.setExecutorName(userBean.getUserInfo().getName());
......@@ -808,8 +837,6 @@ public class JxglController {
}
}
return ResultUtil.success();
}
......@@ -838,8 +865,8 @@ public class JxglController {
* 查询-绩效考核-列表-归档
*/
@PostMapping(value = "/selects_performance_appraisal_archive")
@ApiOperation(value = "8.查询-绩效考核-列表-归档", httpMethod = "POST", notes = "查询-绩效考核-列表-归档")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "11.查询-绩效考核-列表-归档", httpMethod = "POST", notes = "查询-绩效考核-列表-归档")
@ApiOperationSupport(order = 11)
@Role
public Result<Object> selectsPAArchive(@CurrentUser UserBean userBean,
@RequestBody PerformanceAppraisalQuery query) {
......@@ -859,8 +886,8 @@ public class JxglController {
* 查询-绩效考核-列表-非归档
*/
@PostMapping(value = "/selects_performance_appraisal")
@ApiOperation(value = "9.查询-绩效考核-列表-非归档", httpMethod = "POST", notes = "查询-绩效考核-列表-非归档")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "12.查询-绩效考核-列表-非归档", httpMethod = "POST", notes = "查询-绩效考核-列表-非归档")
@ApiOperationSupport(order = 12)
@Role
public Result<Object> selectsPA(@CurrentUser UserBean userBean, @RequestBody PerformanceAppraisalQuery query) {
......@@ -879,8 +906,8 @@ public class JxglController {
* 查询-考核-列表
*/
@PostMapping(value = "/selects_appraisal")
@ApiOperation(value = "10.查询-考核-列表", httpMethod = "POST", notes = "查询-考核-列表")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "13.查询-考核-列表", httpMethod = "POST", notes = "查询-考核-列表")
@ApiOperationSupport(order = 13)
@Role
public Result<Object> selectsA(@CurrentUser UserBean userBean, @RequestBody AppraisalQuery query) {
......@@ -916,8 +943,8 @@ public class JxglController {
* 查询-考核-详情
*/
@GetMapping(value = "/select_appraisal/{id}")
@ApiOperation(value = "11.查询-考核-详情", httpMethod = "GET", notes = "查询-考核-详情")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "14.查询-考核-详情", httpMethod = "GET", notes = "查询-考核-详情")
@ApiOperationSupport(order = 14)
public Result<Object> selectA(@CurrentUser UserBean userBean, @PathVariable Integer id) {
AppraisalDetail aD = jxglAppraisalMapper.selectDetailById(userBean.getOrgCode(), id);
......@@ -949,8 +976,8 @@ public class JxglController {
* 修改-流程执行人-转派
*/
@PutMapping(value = "/update_process_node")
@ApiOperation(value = "12.修改-流程执行人-转派", httpMethod = "PUT", notes = "修改-流程执行人-转派")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "15.修改-流程执行人-转派", httpMethod = "PUT", notes = "修改-流程执行人-转派")
@ApiOperationSupport(order = 15)
@Role
public Result<Object> updatePN(@CurrentUser UserBean userBean,
@Validated @RequestBody ProcessNodeUpdate processNodeUpdate) {
......@@ -991,8 +1018,8 @@ public class JxglController {
* 终止-考核
*/
@PutMapping(value = "/termination_assessment")
@ApiOperation(value = "13.终止-考核", httpMethod = "PUT", notes = "终止-考核")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "16.终止-考核", httpMethod = "PUT", notes = "终止-考核")
@ApiOperationSupport(order = 16)
@Role
@Log(title = "终止-考核")
public Result<Object> terminationAssessment(@CurrentUser UserBean userBean, @NotNull @RequestParam Integer id) {
......@@ -1024,8 +1051,8 @@ public class JxglController {
* 查询-绩效管理-员工绩效-汇总
*/
@PostMapping(value = "/selects_emp_performance")
@ApiOperation(value = "14.查询-绩效管理-员工绩效-汇总", httpMethod = "POST", notes = " 查询-绩效管理-员工绩效-汇总")
@ApiOperationSupport(order = 14)
@ApiOperation(value = "17.查询-绩效管理-员工绩效-汇总", httpMethod = "POST", notes = " 查询-绩效管理-员工绩效-汇总")
@ApiOperationSupport(order = 17)
@Role
public Result<Object> selectsEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) {
......@@ -1061,8 +1088,8 @@ public class JxglController {
* 查询-某员工考核-列表
*/
@PostMapping(value = "/selects_emp_appraisal")
@ApiOperation(value = "15.查询-某员工考核-列表", httpMethod = "POST", notes = "查询-某员工考核-列表")
@ApiOperationSupport(order = 15)
@ApiOperation(value = "18.查询-某员工考核-列表", httpMethod = "POST", notes = "查询-某员工考核-列表")
@ApiOperationSupport(order = 18)
@Role
public Result<Object> selectsEA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) {
......@@ -1082,8 +1109,8 @@ public class JxglController {
* 查询-我的绩效-考核我的-列表
*/
@PostMapping(value = "/selects_my_appraisal")
@ApiOperation(value = "15.查询-我的绩效-考核我的-列表", httpMethod = "POST", notes = "查询-我的绩效-考核我的-列表")
@ApiOperationSupport(order = 15)
@ApiOperation(value = "19.查询-我的绩效-考核我的-列表", httpMethod = "POST", notes = "查询-我的绩效-考核我的-列表")
@ApiOperationSupport(order = 19)
public Result<Object> selectsMA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) {
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),
......@@ -1103,8 +1130,8 @@ public class JxglController {
* 查询-绩效考核-方案
*/
@GetMapping(value = "/selects_performance_appraisal/{id}")
@ApiOperation(value = "16.查询-绩效考核-方案", httpMethod = "GET", notes = "查询-绩效考核-方案")
@ApiOperationSupport(order = 16)
@ApiOperation(value = "20.查询-绩效考核-方案", httpMethod = "GET", notes = "查询-绩效考核-方案")
@ApiOperationSupport(order = 20)
@Role
public Result<Object> selectPA(@CurrentUser UserBean userBean, @PathVariable Integer id) {
......@@ -1132,8 +1159,8 @@ public class JxglController {
* 查询-目标待填写/目标待确认/评分/结果待确认-列表
*/
@PostMapping(value = "/selects_my_performance")
@ApiOperation(value = "17.查询-目标待填写/目标待确认/评分/结果待确认-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 17)
@ApiOperation(value = "21.查询-目标待填写/目标待确认/评分/结果待确认-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 21)
public Result<Object> selects(@CurrentUser UserBean userBean,@Validated @RequestBody MyPerformance query) {
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
......@@ -1157,12 +1184,10 @@ public class JxglController {
* 查询-我的绩效-已处理-列表
*/
@PostMapping(value = "/selects_my_performance_processed")
@ApiOperation(value = "18.查询-我的绩效-已处理-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 18)
public Result<Object> selectsP(@CurrentUser UserBean userBean) {
@ApiOperation(value = "22.查询-我的绩效-已处理-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 22)
public Result<Object> selectsP(@CurrentUser UserBean userBean, @Validated @RequestBody MyPerformance query) {
MyPerformance query = MyPerformance.builder().build();
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
query.setOrgCode(userBean.getOrgCode());
query.setId(userBean.getEmpNum());
......@@ -1179,8 +1204,8 @@ public class JxglController {
* 目标填写-保存
*/
@PostMapping(value = "/save_target_fill")
@ApiOperation(value = "17.目标填写-保存", httpMethod = "POST", notes = "目标填写-保存")
@ApiOperationSupport(order = 17)
@ApiOperation(value = "23.目标填写-保存", httpMethod = "POST", notes = "目标填写-保存")
@ApiOperationSupport(order = 23)
public Result<Object> saveTF(@CurrentUser UserBean userBean, @RequestBody AppraisalUpdate appraisalUpdate)
throws Exception {
......@@ -1271,8 +1296,8 @@ public class JxglController {
* 目标填写-提交
*/
@PostMapping(value = "/submit_target_fill")
@ApiOperation(value = "17.目标填写-提交", httpMethod = "POST", notes = "目标填写-提交")
@ApiOperationSupport(order = 17)
@ApiOperation(value = "24.目标填写-提交", httpMethod = "POST", notes = "目标填写-提交")
@ApiOperationSupport(order = 24)
public Result<Object> submitTF(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
......@@ -1354,8 +1379,8 @@ public class JxglController {
* 目标确认-同意
*/
@PostMapping(value = "/update_target_confirmed")
@ApiOperation(value = "18.目标确认-同意", httpMethod = "POST", notes = "目标确认-同意")
@ApiOperationSupport(order = 18)
@ApiOperation(value = "25.目标确认-同意", httpMethod = "POST", notes = "目标确认-同意")
@ApiOperationSupport(order = 25)
public Result<Object> updateTC(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
......@@ -1422,8 +1447,8 @@ public class JxglController {
* 目标确认-驳回目标
*/
@PostMapping(value = "/update_target_confirmed_reject")
@ApiOperation(value = "18.目标确认-驳回目标", httpMethod = "POST", notes = "目标确认-驳回目标")
@ApiOperationSupport(order = 18)
@ApiOperation(value = "26.目标确认-驳回目标", httpMethod = "POST", notes = "目标确认-驳回目标")
@ApiOperationSupport(order = 26)
public Result<Object> updateTCR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount(
......@@ -1490,8 +1515,8 @@ public class JxglController {
* 评价 -驳回目标
*/
@PostMapping(value = "/update_superior_score_reject")
@ApiOperation(value = "19.评价 -驳回目标", httpMethod = "POST", notes = "评价 -驳回目标")
@ApiOperationSupport(order = 19)
@ApiOperation(value = "27.评价 -驳回目标", httpMethod = "POST", notes = "评价 -驳回目标")
@ApiOperationSupport(order = 27)
public Result<Object> updateSSR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount(
......@@ -1570,8 +1595,8 @@ public class JxglController {
* 上级评价 -驳回评分
*/
@PostMapping(value = "/update_superior_reject_score")
@ApiOperation(value = "20.上级评价 -驳回评分", httpMethod = "POST", notes = "上级评价 -驳回评分")
@ApiOperationSupport(order = 20)
@ApiOperation(value = "28.上级评价 -驳回评分", httpMethod = "POST", notes = "上级评价 -驳回评分")
@ApiOperationSupport(order = 28)
public Result<Object> updateSRS(@CurrentUser UserBean userBean,@Validated @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount(
......@@ -1654,8 +1679,8 @@ public class JxglController {
* 评分提交
*/
@PostMapping(value = "/save_score")
@ApiOperation(value = "22.评分提交", httpMethod = "POST", notes = "评分提交")
@ApiOperationSupport(order = 22)
@ApiOperation(value = "29.评分提交", httpMethod = "POST", notes = "评分提交")
@ApiOperationSupport(order = 29)
@Log(title = "评分提交")
public Result<Object> saveScore(@CurrentUser UserBean userBean,
@Validated @RequestBody ValidList<AppraisalAssessment> appraisalAssessments) throws Exception{
......@@ -1861,8 +1886,8 @@ public class JxglController {
* 结果确认-确认
*/
@PostMapping(value = "/result_verification")
@ApiOperation(value = "23.结果确认-确认", httpMethod = "POST", notes = "结果确认-确认")
@ApiOperationSupport(order = 23)
@ApiOperation(value = "30.结果确认-确认", httpMethod = "POST", notes = "结果确认-确认")
@ApiOperationSupport(order = 30)
public Result<Object> resultVerification(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
......@@ -1919,8 +1944,8 @@ public class JxglController {
* 结果确认-改分
*/
@PostMapping(value = "/change_score")
@ApiOperation(value = "24.结果确认-改分", httpMethod = "POST", notes = "结果确认-改分")
@ApiOperationSupport(order = 24)
@ApiOperation(value = "31.结果确认-改分", httpMethod = "POST", notes = "结果确认-改分")
@ApiOperationSupport(order = 31)
@Log(title = "绩效管理-结果确认-改分", businessType = BusinessType.UPDATE)
public Result<Object> changeScore(@CurrentUser UserBean userBean,
@Validated @RequestBody AppraisalAssessment appraisalAssessment) {
......@@ -1984,8 +2009,8 @@ public class JxglController {
* 查询-我的绩效-员工绩效
*/
@PostMapping(value = "/selects_my_emp_performance")
@ApiOperation(value = "25.查询-我的绩效-员工绩效", httpMethod = "POST", notes = "查询-我的绩效-员工绩效")
@ApiOperationSupport(order = 25)
@ApiOperation(value = "32.查询-我的绩效-员工绩效", httpMethod = "POST", notes = "查询-我的绩效-员工绩效")
@ApiOperationSupport(order = 32)
@Log(title = "绩效管理-查询-我的绩效-员工绩效")
public Result<Object> selectsMEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) {
Integer orgCode = userBean.getOrgCode();
......
src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
......@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService {
res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("B");
performanceRating.setSectionMinScore(60);
......@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setRanks(0);
res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("A");
performanceRating.setSectionMinScore(80);
......
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
......@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
......@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.timer.api.aspect.lang.annotation.Log;
import cn.timer.api.aspect.lang.enums.BusinessType;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.spmk.SpmkApprovalG;
import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
......@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts;
import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.config.enums.SysRoleType;
import cn.timer.api.config.exception.CustomException;
import cn.timer.api.config.validation.Insert;
import cn.timer.api.config.validation.Ranks;
......@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList;
import cn.timer.api.controller.spmk.service.SpmkService;
import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper;
......@@ -103,6 +107,8 @@ public class SpmkController {
private ZzglBmgwMService zzglBmgwMService;
@Autowired
private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
@Autowired
private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
@Autowired
private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper;
......@@ -691,7 +697,17 @@ public class SpmkController {
.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
.eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) {
return ResultUtil.error("非当前审批人,无法审批!");
Integer adminNum = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
.eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum())
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
.in(QyzxEmpEntAsso::getUserType, SysRoleType.U_TYPE_ADMIN,SysRoleType.U_TYPE_C_ADMIN)
.count();
if (adminNum <= 0) {
return ResultUtil.error("非当前审批人 或 管理员,无法操作!");
}
}
if (aSummary.getSts() == 0) {
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java
......@@ -1309,8 +1309,7 @@ public class YgglController {
LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum)
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
;
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode());
// 确认离职 删除员工关联表
qyzxEmpEntAssoMapper.delete(queryWrapper);
......@@ -1322,7 +1321,8 @@ public class YgglController {
.eq(ZzglBmgwM::getLeader, empNum));
// 更新当前企业
List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(queryWrapper);
List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum));
if (listEEA != null && listEEA.size() > 0) {
QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
}
......
src/main/java/cn/timer/api/dto/qyzx/EntRegisterDto.java
......@@ -21,29 +21,32 @@ public class EntRegisterDto implements Serializable {
@ApiModelProperty(value = "密码", example = "123456")
private String pw;
@ApiModelProperty(value = "用户名", example = "用户名")
private String username;
@ApiModelProperty(value = "企业名称 ", example = "企业名称")
private String name;
@ApiModelProperty(value = "短信时间 ", example = "20191207")
private String sendDate;
@ApiModelProperty(value = "原密码", example = "666666")
private String oldPwd;
@ApiModelProperty(value = "验证码 ", example = "666666")
private String code;
@ApiModelProperty(value = "邮箱", example = "youxiang@qq.com")
private String email;
@ApiModelProperty(value = "1.验证码 2.消息推送 3通知提醒 ", example = "1")
private Integer messageType;
@ApiModelProperty(value = "短信模板：1.身份验证验证码 2.登录确认验证码 3.登录异常验证码 4.用户注册验证码 5.修改密码验证码 6.信息变更验证码 ", example = "1")
private Integer tc;
@ApiModelProperty(value = "1.原密码修改 2.验证码修改 ", example = "1")
private Integer pwUpdateType;
}
src/main/java/cn/timer/api/utils/DateUtil.java
......@@ -99,6 +99,35 @@ public class DateUtil {
return 0;
}
/**
* 将String时间转换为时间戳
*
* @param time
* @return
* @throws ParseException
*/
public static Date getFormatDate(String time) throws ParseException {
if (StrUtil.isNotBlank(time)) {
switch (time.length()) {
case 10:
return getStringDate(time, "yyyy-MM-dd");
case 16:
return getStringDate(time, "yyyy-MM-dd HH:mm");
case 19:
return getStringDate(time, "yyyy-MM-dd HH:mm:ss");
default:
break;
}
return null;
}
return null;
}
/**
* 将String时间转换为时间戳
......@@ -107,6 +136,19 @@ public class DateUtil {
* @return
* @throws ParseException
*/
public static Date getStringDate(String time, String format)
throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
return simpleDateFormat.parse(time);
}
/**
* 将String时间转换为 Date
*
* @param time
* @return
* @throws ParseException
*/
public static long getStringTime(String time, String format)
throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
......
src/main/java/cn/timer/api/utils/router/business/GoOutBusiness.java
......@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness {
.orgcode(orgCode)
.evectionid(Convert.toInt(approveId))
.evectiontype(2)
.starttime(DateUtil.getStringTime(startTime, "yyyy-MM-dd HH:mm:ss"))
.endtime(DateUtil.getStringTime(endTime, "yyyy-MM-dd HH:mm:ss"))
.starttime(DateUtil.getFormat(startTime))
.endtime(DateUtil.getFormat(endTime))
.duration(Convert.toDouble(longTime))
.build();
......
src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java
......@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.YgzzDto;
import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder;
/**
......@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
YgzzDto ygzzDto = YgzzDto.builder()
.empNum(id)
.orgCode(orgCode)
.zzTime(DateFormatUtils.getDateByString(confirmationTime))
.sjzzTime(DateFormatUtils.getDateByString(newConfirmationTime))
.zzTime(DateUtil.getFormatDate(confirmationTime))
.sjzzTime(DateUtil.getFormatDate(newConfirmationTime))
.zzRemark(Remarks)
.build();
System.out.println("转正:"+ygzzDto);
......
src/main/java/cn/timer/api/utils/router/business/ResignationBusiness.java
......@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.LzygQueryDto;
import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder;
/**
......@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
LzygQueryDto dtO = LzygQueryDto.builder()
.orgCode(orgCode)
.empNum(id)
.lzTime(DateFormatUtils.getDateByString(terminationDate))
.lzTime(DateUtil.getFormatDate(terminationDate))
.lzyy(ReasonForResignation)
.lzbz(Remarks)
.build();
......
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