Skip to content

8
8timerapiv200
Commit 7856b36b by 邓实川
Options

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

parents f495dd47 a41b62c6
Showing with 144 additions and 403 deletions
src/main/java/cn/timer/api/config/page/SimplePageBuilder.java deleted 100644 → 0
package cn.timer.api.config.page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
public class SimplePageBuilder {
/**
* 以常量的形式存储，在实际的运用中应该从properties文件中取得，思路都一样
*/
public static final int size = 10;
@SuppressWarnings("deprecation")
public static Pageable generate(int page, int size, Sort sort) {
if (sort == null)
return new PageRequest(page, size);
return new PageRequest(page, size, sort);
}
public static Pageable generate(int page) {
return generate(page, size, null);
}
public static Pageable generate(int page, Sort sort) {
return generate(page, size, sort);
}
}
src/main/java/cn/timer/api/config/sort/SimpleSortBuilder.java deleted 100644 → 0
package cn.timer.api.config.sort;
import java.util.ArrayList;
import java.util.List;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.domain.Sort.Order;
public class SimpleSortBuilder {
/**
* 调用的时候使用SimpleSortBuilder.generateSort("name","xh_d");表示先以name升序，之后以xh降序
*/
@SuppressWarnings("deprecation")
public static Sort generateSort(String... fields) {
List<Order> orders = new ArrayList<Order>();
for(String f:fields) {
orders.add(generateOrder(f));
}
return new Sort(orders);
}
@SuppressWarnings("deprecation")
private static Order generateOrder(String f) {
Order order = null;
String[] ff = f.split("_");
if(ff.length>=2) {
if(ff[1].equals("d")) {
order = new Order(Direction.DESC,ff[0]);
} else {
order = new Order(Direction.ASC,ff[0]);
}
return order;
}
order = new Order(f);
return order;
}
}
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -439,13 +439,7 @@ public class LoginController { ...@@ -439,13 +439,7 @@ public class LoginController {
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
@Log(title = "企业注册", businessType = BusinessType.INSERT) @Log(title = "企业注册", businessType = BusinessType.INSERT)
public Result<String> register(@RequestBody EntRegisterDto entRegisterDto) throws Exception{ public Result<String> register(@RequestBody EntRegisterDto entRegisterDto) throws Exception{
// 事务回滚
/*
* DefaultTransactionDefinition def = new DefaultTransactionDefinition();
* def.setName("register");
* def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
* TransactionStatus status = transactionManager.getTransaction(def);
*/
try { try {
String phone = entRegisterDto.getPhone(); String phone = entRegisterDto.getPhone();
String username = entRegisterDto.getUsername(); String username = entRegisterDto.getUsername();
......
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
...@@ -33,7 +33,7 @@ public class ClockInTool { ...@@ -33,7 +33,7 @@ public class ClockInTool {
// 用StringBuffer来存放数组中的非空元素，用“;”分隔 // 用StringBuffer来存放数组中的非空元素，用“;”分隔
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i = 0; i < str.length; i++) { for (int i = 0; i < str.length; i++) {
if ("".equals(str[i])) { if ("null".equals(str[i])) {
continue; continue;
} }
sb.append(str[i]); sb.append(str[i]);
......
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
package cn.timer.api.controller.kqgl.atttimer; package cn.timer.api.controller.kqgl.atttimer;
import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -7,6 +8,7 @@ import java.util.Arrays; ...@@ -7,6 +8,7 @@ import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
...@@ -293,11 +295,14 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -293,11 +295,14 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
} }
} }
}else if(attgro.getPbfs() == 2){ //自由排班 }else if(attgro.getPbfs() == 2){ //自由排班
DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
List<Schedule> ycqs = schedulemapper.getAttendanceShouldList(user.getEmpnum(),startDate,endDate); List<Schedule> ycqs = schedulemapper.getAttendanceShouldList(user.getEmpnum(),startDate,endDate);
int xiuxi = 0,shangban = 0,z=0; int xiuxi = 0,shangban = 0,z=0;
String[] ziyoupb = new String[ycqs.size()]; String[] ziyoupb = new String[ycqs.size()];
for(Schedule sc : ycqs){ for(Schedule sc : ycqs){
ziyoupb[z] = String.valueOf(sc.getData()); String data = new SimpleDateFormat("yyyy-MM-dd").format(df.parse(String.valueOf(sc.getData())));// 获得格式化后的日期字符串
ziyoupb[z] = data;
z++; z++;
if(sc.getBcid().equals(0)){ if(sc.getBcid().equals(0)){
xiuxi++; xiuxi++;
...@@ -314,6 +319,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -314,6 +319,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
KqglAssoPbmx pbx = KqglAssoPbmx.builder().build().selectOne(new QueryWrapper<KqglAssoPbmx>().lambda().eq(KqglAssoPbmx::getUserid, user.getEmpnum()).eq(KqglAssoPbmx::getData, num).eq(KqglAssoPbmx::getKqzid, attgro.getId())); KqglAssoPbmx pbx = KqglAssoPbmx.builder().build().selectOne(new QueryWrapper<KqglAssoPbmx>().lambda().eq(KqglAssoPbmx::getUserid, user.getEmpnum()).eq(KqglAssoPbmx::getData, num).eq(KqglAssoPbmx::getKqzid, attgro.getId()));
if(pbx!=null && pbx.getBcid()!=0) { if(pbx!=null && pbx.getBcid()!=0) {
ycqts[y] = num; ycqts[y] = num;
y++;
zjgzts++; zjgzts++;
}else { }else {
xxts[x] = num; xxts[x] = num;
...@@ -350,6 +356,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -350,6 +356,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
for(String num : range) { for(String num : range) {
if(Arrays.binarySearch(ziyoupb, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间 if(Arrays.binarySearch(ziyoupb, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间
ycqts[g] = num; ycqts[g] = num;
g++;
zjgzts++; zjgzts++;
}else { }else {
xxts[x] = num; xxts[x] = num;
...@@ -446,16 +453,18 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -446,16 +453,18 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
//遍历目前为止所有日期 结合该用户发起的审批进行结合 //遍历目前为止所有日期 结合该用户发起的审批进行结合
//1:加班 2:请假 3:出差 4:外出 5:补卡 //1:加班 2:请假 3:出差 4:外出 5:补卡
for(String num : range) { for(String num : range) {
if(Arrays.binarySearch(ClockInTool.replaceNull(xxts), num) >= 0 && Arrays.binarySearch(ClockInTool.replaceNull(dkjtts),num) >= 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xxts),"null"), num) >= 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(dkjtts),"null"),num) >= 0) {
rowData.add("休息并打卡"); rowData.add("休息并打卡");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(xxts), num) >= 0){ }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xxts),"null"), num) >= 0){
rowData.add("休息"); rowData.add("休息");
}else { }else {
if(Arrays.binarySearch(ClockInTool.replaceNull(ycqts), num) < 0 && Arrays.binarySearch(ClockInTool.replaceNull(leaves), num) < 0 && Arrays.binarySearch(ClockInTool.replaceNull(travels), num) < 0 && Arrays.binarySearch(ClockInTool.replaceNull(goouts), num) < 0 && Arrays.binarySearch(ClockInTool.replaceNull(cards), num) < 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ycqts),"null"), num) >= 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(dkjtts),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(leaves),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(travels),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(goouts),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(cards),"null"), num) < 0) {
rowData.add("旷工"); rowData.add("旷工");
}else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ycqts),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xxts),"null"), num) < 0) {//日期不在上班也不在休息里面即为未排班
rowData.add("未排班");
}else if(sdf1.parse(beginTime).getTime() < sdf1.parse(num).getTime()) { }else if(sdf1.parse(beginTime).getTime() < sdf1.parse(num).getTime()) {
rowData.add("未到班期"); rowData.add("未到班期");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(leaves), num) >= 0) {//请假 }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(leaves),"null"), num) >= 0) {//请假
KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 2)); KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 2));
String leavetype = "未知";//请假类型 String leavetype = "未知";//请假类型
String company = "未知";//请假单位 String company = "未知";//请假单位
...@@ -471,16 +480,16 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -471,16 +480,16 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
} }
rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"请"+leavetype+lea.getDuration()+company); rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"请"+leavetype+lea.getDuration()+company);
}else if(Arrays.binarySearch(ClockInTool.replaceNull(travels), num) >= 0) {//出差 }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(travels),"null"), num) >= 0) {//出差
KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 3)); KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 3));
rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"出差"+lea.getDuration()+"天"); rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"出差"+lea.getDuration()+"天");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(goouts), num) >= 0){//外出 }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(goouts),"null"), num) >= 0){//外出
KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 4)); KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 4));
rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"外出"+lea.getDuration()+"天"); rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"外出"+lea.getDuration()+"天");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(cards), num) >= 0){//补卡 }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(cards),"null"), num) >= 0){//补卡
KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 5)); KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 5));
rowData.add("已补卡:"+lea.getStartTime()); rowData.add("已补卡:"+lea.getStartTime());
}else if(Arrays.binarySearch(ClockInTool.replaceNull(overtimes), num) >= 0) {//加班 }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(overtimes),"null"), num) >= 0) {//加班
KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 1)); KqglAssoRelationSummary lea = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, user.getEmpnum()).eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getApprovalType, 1));
String company = "未知",method = "无";//加班单位、加班补偿方式 String company = "未知",method = "无";//加班单位、加班补偿方式
...@@ -498,7 +507,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -498,7 +507,7 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"加班"+lea.getDuration()+company+"["+method+"]"); rowData.add(lea.getStartTime() +"到"+ lea.getEndTime()+"加班"+lea.getDuration()+company+"["+method+"]");
//加班补偿方式 1：转调休；2：转加班费；3：转调休或加班费 //加班补偿方式 1：转调休；2：转加班费；3：转调休或加班费
//工作日 //工作日
if(Arrays.binarySearch(ClockInTool.replaceNull(ycqts), num) >= 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ycqts),"null"), num) >= 0) {
if(lea.getCompensateId() == 1) { if(lea.getCompensateId() == 1) {
workingturncompenleave++; workingturncompenleave++;
}else if(lea.getCompensateId() == 2) { }else if(lea.getCompensateId() == 2) {
...@@ -506,14 +515,14 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -506,14 +515,14 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
} }
} }
//休息日 //休息日
if(Arrays.binarySearch(ClockInTool.replaceNull(xxts), num) >= 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xxts),"null"), num) >= 0) {
if(lea.getCompensateId() == 1) { if(lea.getCompensateId() == 1) {
restturncompenleave++; restturncompenleave++;
}else if(lea.getCompensateId() == 2) { }else if(lea.getCompensateId() == 2) {
resttransferovertime++; resttransferovertime++;
} }
} }
if(Arrays.binarySearch(ClockInTool.replaceNull(ycqts), num) < 0 && Arrays.binarySearch(ClockInTool.replaceNull(xxts), num) < 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ycqts),"null"), num) < 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xxts),"null"), num) < 0) {
if(lea.getCompensateId() == 1) { if(lea.getCompensateId() == 1) {
holidayturncompenleave++; holidayturncompenleave++;
}else if(lea.getCompensateId() == 2) { }else if(lea.getCompensateId() == 2) {
...@@ -521,19 +530,19 @@ public class AttendanceTaskTiming implements SchedulingConfigurer { ...@@ -521,19 +530,19 @@ public class AttendanceTaskTiming implements SchedulingConfigurer {
} }
} }
}else{ }else{
if(Arrays.binarySearch(ClockInTool.replaceNull(sblacks), num) >= 0) { if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(sblacks),"null"), num) >= 0) {
rowData.add("上班缺卡"); rowData.add("上班缺卡");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(sblacks), num) >= 0 && Arrays.binarySearch(ClockInTool.replaceNull(ztts), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(sblacks),"null"), num) >= 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ztts),"null"), num) >= 0) {
rowData.add("上班缺卡,下班早退"); rowData.add("上班缺卡,下班早退");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(cdts), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(cdts),"null"), num) >= 0) {
rowData.add("上班迟到"); rowData.add("上班迟到");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(cdts), num) >= 0 && Arrays.binarySearch(ClockInTool.replaceNull(xblacks), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(cdts),"null"), num) >= 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xblacks),"null"), num) >= 0) {
rowData.add("上班迟到,下班缺卡"); rowData.add("上班迟到,下班缺卡");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(cdts), num) >= 0 && Arrays.binarySearch(ClockInTool.replaceNull(ztts), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(cdts),"null"), num) >= 0 && Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ztts),"null"), num) >= 0) {
rowData.add("上班迟到,下班早退"); rowData.add("上班迟到,下班早退");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(xblacks), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(xblacks),"null"), num) >= 0) {
rowData.add("下班缺卡"); rowData.add("下班缺卡");
}else if(Arrays.binarySearch(ClockInTool.replaceNull(ztts), num) >= 0) { }else if(Arrays.binarySearch(ClockInTool.doChinFilters(ClockInTool.replaceNull(ztts),"null"), num) >= 0) {
rowData.add("下班早退"); rowData.add("下班早退");
}else { }else {
rowData.add("正常"); rowData.add("正常");
......
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
...@@ -94,6 +94,7 @@ public class SpmkController { ...@@ -94,6 +94,7 @@ public class SpmkController {
private SpmkService spmkService; private SpmkService spmkService;
@Autowired @Autowired
private ZzglBmgwMService zzglBmgwMService; private ZzglBmgwMService zzglBmgwMService;
@Autowired @Autowired
private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper; private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
@Autowired @Autowired
...@@ -115,8 +116,6 @@ public class SpmkController { ...@@ -115,8 +116,6 @@ public class SpmkController {
private boolean ISFIRST = true; // 第一次启动审批流程 private boolean ISFIRST = true; // 第一次启动审批流程
//TODO 审批模板组 //TODO 审批模板组
/** /**
* 新增或编辑-审批模板组 * 新增或编辑-审批模板组
...@@ -280,7 +279,7 @@ public class SpmkController { ...@@ -280,7 +279,7 @@ public class SpmkController {
} }
spmkApprovalG.setOrgCode(userBean.getOrgCode()); spmkApprovalG.setOrgCode(userBean.getOrgCode());
return spmkApprovalG.insertOrUpdate() ? ResultUtil.data(spmkApprovalG, "操作成功!") : ResultUtil.error(); return spmkApprovalG.insertOrUpdate() ? ResultUtil.data(spmkApprovalG) : ResultUtil.error();
} }
...@@ -293,7 +292,7 @@ public class SpmkController { ...@@ -293,7 +292,7 @@ public class SpmkController {
public Result<Object> deleteAgById(@PathVariable int id){ public Result<Object> deleteAgById(@PathVariable int id){
if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 )
return ResultUtil.error("审批组存在 自定义审批，不可直接删除!"); return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象"); return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
...@@ -309,7 +308,7 @@ public class SpmkController { ...@@ -309,7 +308,7 @@ public class SpmkController {
List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum()); List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
System.out.println(depts); System.out.println(depts);
return ResultUtil.data(spmkApprovalGMapper.selectListAgInCaByAdmin(userBean.getOrgCode(), userBean.getEmpNum(), depts),"操作成功!"); return ResultUtil.data(spmkApprovalGMapper.selectListAgInCaByAdmin(userBean.getOrgCode(), userBean.getEmpNum(), depts));
} }
...@@ -321,7 +320,7 @@ public class SpmkController { ...@@ -321,7 +320,7 @@ public class SpmkController {
@ApiOperationSupport(order = 11) @ApiOperationSupport(order = 11)
public Result<Object> selectListAg(@CurrentUser UserBean userBean){ public Result<Object> selectListAg(@CurrentUser UserBean userBean){
return ResultUtil.data(spmkService.selectListAg(userBean) ,"操作成功!"); return ResultUtil.data(spmkService.selectListAg(userBean));
} }
/** /**
...@@ -332,7 +331,7 @@ public class SpmkController { ...@@ -332,7 +331,7 @@ public class SpmkController {
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 12)
public Result<Object> ranksAg(@Validated({Ranks.class}) @RequestBody ValidList<SpmkApprovalG> list){ public Result<Object> ranksAg(@Validated({Ranks.class}) @RequestBody ValidList<SpmkApprovalG> list){
if (list == null || (list != null && list.size() <= 0)) { if (list == null || list.size() <= 0) {
return ResultUtil.success(); return ResultUtil.success();
} }
...@@ -398,7 +397,7 @@ public class SpmkController { ...@@ -398,7 +397,7 @@ public class SpmkController {
// 清空前端不需要的字段再返回,节省流量 // 清空前端不需要的字段再返回,节省流量
ca.setFroms(null); ca.setFroms(null);
ca.setRouter(null); ca.setRouter(null);
return ResultUtil.data(ca, "操作成功!"); return ResultUtil.data(ca);
} }
...@@ -435,7 +434,7 @@ public class SpmkController { ...@@ -435,7 +434,7 @@ public class SpmkController {
.build(); .build();
BeanUtil.copyProperties(ca, caD,"froms","router"); BeanUtil.copyProperties(ca, caD,"froms","router");
caD.setInitiatorConfigs(listIc); caD.setInitiatorConfigs(listIc);
return ResultUtil.data(caD,"操作成功!"); return ResultUtil.data(caD);
} }
/** /**
...@@ -544,7 +543,7 @@ public class SpmkController { ...@@ -544,7 +543,7 @@ public class SpmkController {
List<YgglMainEmp> listYgglMainEmp = RouterUtils.selectOtherlistent(userBean.getOrgCode(), deptId); List<YgglMainEmp> listYgglMainEmp = RouterUtils.selectOtherlistent(userBean.getOrgCode(), deptId);
if (deptId != null && (listYgglMainEmp == null || listYgglMainEmp.size() == 0)) { if (deptId != null && (listYgglMainEmp == null || listYgglMainEmp.size() == 0)) {
return ResultUtil.data(new ArrayList<SpmkApproveSummary>(), "操作成功!"); return ResultUtil.data(new ArrayList<SpmkApproveSummary>());
} }
List<Integer> empNums = new ArrayList<Integer>(); List<Integer> empNums = new ArrayList<Integer>();
...@@ -558,7 +557,7 @@ public class SpmkController { ...@@ -558,7 +557,7 @@ public class SpmkController {
List<SpmkApproveSummary> listAs = pageAs.getRecords(); List<SpmkApproveSummary> listAs = pageAs.getRecords();
return ResultUtil.data(pageAs, listAs, "操作成功!"); return ResultUtil.data(pageAs, listAs);
} }
//TODO 审批详情 //TODO 审批详情
...@@ -573,7 +572,7 @@ public class SpmkController { ...@@ -573,7 +572,7 @@ public class SpmkController {
SpmkApproveDetailDto adD = spmkService.selectApproveDetailByAsId(id); SpmkApproveDetailDto adD = spmkService.selectApproveDetailByAsId(id);
return ResultUtil.data(adD, "操作成功!"); return ResultUtil.data(adD);
} }
//TODO 审批人审批 //TODO 审批人审批
...@@ -682,7 +681,7 @@ public class SpmkController { ...@@ -682,7 +681,7 @@ public class SpmkController {
IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto); IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);
List<SpmkApproveSummary> listAs = pageAs.getRecords(); List<SpmkApproveSummary> listAs = pageAs.getRecords();
return ResultUtil.data(pageAs, listAs, "操作成功!"); return ResultUtil.data(pageAs, listAs);
} }
//TODO 撤销审批 //TODO 撤销审批
...@@ -770,6 +769,6 @@ public class SpmkController { ...@@ -770,6 +769,6 @@ public class SpmkController {
List<SpmkIcon> spmkIcons = SpmkIcon.builder().build().selectAll(); List<SpmkIcon> spmkIcons = SpmkIcon.builder().build().selectAll();
return ResultUtil.data(spmkIcons,"获取图标列表成功"); return ResultUtil.data(spmkIcons,"生成 审批组 和 自定义审批成功");
} }
} }
src/main/java/cn/timer/api/controller/yggl/YgglController.java
...@@ -48,6 +48,7 @@ import cn.hutool.core.io.IoUtil; ...@@ -48,6 +48,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
...@@ -156,7 +157,7 @@ public class YgglController { ...@@ -156,7 +157,7 @@ public class YgglController {
if (rz != null) { if (rz != null) {
ygglMainEmp.setWorkTime(DateUtil.formatBetween(rz, new Date(), Level.DAY)); ygglMainEmp.setWorkTime(DateUtil.formatBetween(rz, new Date(), Level.DAY));
} }
return ResultUtil.data(ygglMainEmp, "获取员工档案成功"); return ResultUtil.data(ygglMainEmp);
} }
// 获取员工档案 // 获取员工档案
...@@ -172,7 +173,7 @@ public class YgglController { ...@@ -172,7 +173,7 @@ public class YgglController {
if (rz != null) { if (rz != null) {
ygglMainEmp.setWorkTime(DateUtil.formatBetween(ygglMainEmp.getRzTime(), new Date(), Level.DAY)); ygglMainEmp.setWorkTime(DateUtil.formatBetween(ygglMainEmp.getRzTime(), new Date(), Level.DAY));
} }
return ResultUtil.data(ygglMainEmp, "获取员工档案成功"); return ResultUtil.data(ygglMainEmp);
} }
/** /**
...@@ -186,7 +187,7 @@ public class YgglController { ...@@ -186,7 +187,7 @@ public class YgglController {
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
public Result<String> selectbmgw(@CurrentUser UserBean userBean, @PathVariable Integer gwid) { public Result<String> selectbmgw(@CurrentUser UserBean userBean, @PathVariable Integer gwid) {
if (gwid == null || gwid == 0) { if (gwid == null || gwid == 0) {
return ResultUtil.data("无岗位", "获取员工档案部门岗位名称成功"); return ResultUtil.data("岗位不存在");
} }
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
ZzglBmgwM zzglBmgwM = ZzglBmgwM.builder().build().selectOne(new QueryWrapper<ZzglBmgwM>().lambda() ZzglBmgwM zzglBmgwM = ZzglBmgwM.builder().build().selectOne(new QueryWrapper<ZzglBmgwM>().lambda()
...@@ -207,7 +208,7 @@ public class YgglController { ...@@ -207,7 +208,7 @@ public class YgglController {
bm = z.getName(); bm = z.getName();
} }
String bmgw = bm + "/" + gw; String bmgw = bm + "/" + gw;
return ResultUtil.data(bmgw, "获取员工档案部门岗位名称成功"); return ResultUtil.data(bmgw);
} }
/** /**
...@@ -229,13 +230,14 @@ public class YgglController { ...@@ -229,13 +230,14 @@ public class YgglController {
boolean isvalid = true; boolean isvalid = true;
switch (zjType) { switch (zjType) {
case 0: case 0:
isvalid = ReUtil.isMatch(Regular.IDCARD, zjNum); isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum);
break; break;
case 1: case 1:
isvalid = ReUtil.isMatch(Regular.HKMAKAO, zjNum); String[] strs = IdcardUtil.isValidCard10(zjNum);
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(strs[2]);
break; break;
case 2: case 2:
isvalid = ReUtil.isMatch(Regular.TAIWAN1, zjNum) || ReUtil.isMatch(Regular.TAIWAN2, zjNum); isvalid = IdcardUtil.isValidTWCard(zjNum);
break; break;
case 3: case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum); isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
...@@ -351,7 +353,7 @@ public class YgglController { ...@@ -351,7 +353,7 @@ public class YgglController {
// List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper); // List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper); IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper);
// List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords(); // List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
return ResultUtil.data(ygglMainEmpPage, "员工搜索成功"); return ResultUtil.data(ygglMainEmpPage);
// return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功"); // return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功");
} }
...@@ -405,13 +407,14 @@ public class YgglController { ...@@ -405,13 +407,14 @@ public class YgglController {
boolean isvalid = true; boolean isvalid = true;
switch (zjType) { switch (zjType) {
case 0: case 0:
isvalid = ReUtil.isMatch(Regular.IDCARD, zjNum); isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum);
break; break;
case 1: case 1:
isvalid = ReUtil.isMatch(Regular.HKMAKAO, zjNum); String[] strs = IdcardUtil.isValidCard10(zjNum);
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(strs[2]);
break; break;
case 2: case 2:
isvalid = ReUtil.isMatch(Regular.TAIWAN1, zjNum) || ReUtil.isMatch(Regular.TAIWAN2, zjNum); isvalid = IdcardUtil.isValidTWCard(zjNum);
break; break;
case 3: case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum); isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
...@@ -557,7 +560,7 @@ public class YgglController { ...@@ -557,7 +560,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaJyjlb>().lambda() .selectList(new QueryWrapper<YgglAttaJyjlb>().lambda()
.eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaJyjlb::getEmpNum,userBean.getEmpNum())); .eq(YgglAttaJyjlb::getEmpNum,userBean.getEmpNum()));
return ResultUtil.data(ygglAttaJyjlbss, "获取员工教育经历表成功"); return ResultUtil.data(ygglAttaJyjlbss);
} }
// 获取员工教育经历表 // 获取员工教育经历表
...@@ -569,7 +572,7 @@ public class YgglController { ...@@ -569,7 +572,7 @@ public class YgglController {
new QueryWrapper<YgglAttaJyjlb>().lambda() new QueryWrapper<YgglAttaJyjlb>().lambda()
.eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaJyjlb::getEmpNum, empNum)); .eq(YgglAttaJyjlb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaJyjlbs, "获取员工教育经历表成功"); return ResultUtil.data(ygglAttaJyjlbs);
} }
/** /**
...@@ -585,7 +588,7 @@ public class YgglController { ...@@ -585,7 +588,7 @@ public class YgglController {
ygglAttaJyjlb.setEmpNum(ygglAttaJyjlb.getEmpNum()); ygglAttaJyjlb.setEmpNum(ygglAttaJyjlb.getEmpNum());
ygglAttaJyjlb.setOrgCode(userBean.getOrgCode()); ygglAttaJyjlb.setOrgCode(userBean.getOrgCode());
ygglAttaJyjlb.insertOrUpdate(); ygglAttaJyjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaJyjlb, "添加/修改员工教育经历表成功"); return ResultUtil.data(ygglAttaJyjlb, "修改员工教育经历表成功");
} }
/** /**
...@@ -619,7 +622,7 @@ public class YgglController { ...@@ -619,7 +622,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaPxjlxxb>().lambda() .selectList(new QueryWrapper<YgglAttaPxjlxxb>().lambda()
.eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaPxjlxxb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaPxjlxxb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxbs);
} }
// 获取员工培训经历信息表 // 获取员工培训经历信息表
...@@ -631,7 +634,7 @@ public class YgglController { ...@@ -631,7 +634,7 @@ public class YgglController {
new QueryWrapper<YgglAttaPxjlxxb>().lambda() new QueryWrapper<YgglAttaPxjlxxb>().lambda()
.eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaPxjlxxb::getEmpNum, empNum)); .eq(YgglAttaPxjlxxb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxbs);
} }
/** /**
...@@ -648,7 +651,7 @@ public class YgglController { ...@@ -648,7 +651,7 @@ public class YgglController {
ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum()); ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum());
ygglAttaPxjlxxb.setOrgCode(userBean.getOrgCode()); ygglAttaPxjlxxb.setOrgCode(userBean.getOrgCode());
ygglAttaPxjlxxb.insertOrUpdate(); ygglAttaPxjlxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaPxjlxxb, "添加/修改员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxb, "修改员工培训经历信息表成功");
} }
/** /**
...@@ -682,7 +685,7 @@ public class YgglController { ...@@ -682,7 +685,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaGzjlb>().lambda() .selectList(new QueryWrapper<YgglAttaGzjlb>().lambda()
.eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaGzjlb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaGzjlb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlbs);
} }
// 获取员工工作经历表 // 获取员工工作经历表
...@@ -694,7 +697,7 @@ public class YgglController { ...@@ -694,7 +697,7 @@ public class YgglController {
new QueryWrapper<YgglAttaGzjlb>().lambda() new QueryWrapper<YgglAttaGzjlb>().lambda()
.eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaGzjlb::getEmpNum, empNum)); .eq(YgglAttaGzjlb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlbs);
} }
/** /**
...@@ -710,7 +713,7 @@ public class YgglController { ...@@ -710,7 +713,7 @@ public class YgglController {
ygglAttaGzjlb.setEmpNum(ygglAttaGzjlb.getEmpNum()); ygglAttaGzjlb.setEmpNum(ygglAttaGzjlb.getEmpNum());
ygglAttaGzjlb.setOrgCode(userBean.getOrgCode()); ygglAttaGzjlb.setOrgCode(userBean.getOrgCode());
ygglAttaGzjlb.insertOrUpdate(); ygglAttaGzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlb, "修改员工工作经历表成功");
} }
/** /**
...@@ -744,7 +747,7 @@ public class YgglController { ...@@ -744,7 +747,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaZcxxb>().lambda() .selectList(new QueryWrapper<YgglAttaZcxxb>().lambda()
.eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaZcxxb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaZcxxb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxbs);
} }
// 获取员工职称信息表 // 获取员工职称信息表
...@@ -756,7 +759,7 @@ public class YgglController { ...@@ -756,7 +759,7 @@ public class YgglController {
new QueryWrapper<YgglAttaZcxxb>().lambda() new QueryWrapper<YgglAttaZcxxb>().lambda()
.eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaZcxxb::getEmpNum, empNum)); .eq(YgglAttaZcxxb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxbs);
} }
/** /**
...@@ -772,7 +775,7 @@ public class YgglController { ...@@ -772,7 +775,7 @@ public class YgglController {
ygglAttaZcxxb.setEmpNum(ygglAttaZcxxb.getEmpNum()); ygglAttaZcxxb.setEmpNum(ygglAttaZcxxb.getEmpNum());
ygglAttaZcxxb.setOrgCode(userBean.getOrgCode()); ygglAttaZcxxb.setOrgCode(userBean.getOrgCode());
ygglAttaZcxxb.insertOrUpdate(); ygglAttaZcxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaZcxxb, "添加/修改员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxb, "修改员工职称信息表成功");
} }
/** /**
...@@ -806,7 +809,7 @@ public class YgglController { ...@@ -806,7 +809,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaZszjb>().lambda() .selectList(new QueryWrapper<YgglAttaZszjb>().lambda()
.eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaZszjb::getEmpNum,userBean.getEmpNum())); .eq(YgglAttaZszjb::getEmpNum,userBean.getEmpNum()));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjbs);
} }
// 获取员工证书证件表 // 获取员工证书证件表
...@@ -818,7 +821,7 @@ public class YgglController { ...@@ -818,7 +821,7 @@ public class YgglController {
new QueryWrapper<YgglAttaZszjb>().lambda() new QueryWrapper<YgglAttaZszjb>().lambda()
.eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaZszjb::getEmpNum, empNum)); .eq(YgglAttaZszjb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjbs);
} }
/** /**
...@@ -834,7 +837,7 @@ public class YgglController { ...@@ -834,7 +837,7 @@ public class YgglController {
ygglAttaZszjb.setEmpNum(ygglAttaZszjb.getEmpNum()); ygglAttaZszjb.setEmpNum(ygglAttaZszjb.getEmpNum());
ygglAttaZszjb.setOrgCode(userBean.getOrgCode()); ygglAttaZszjb.setOrgCode(userBean.getOrgCode());
ygglAttaZszjb.insertOrUpdate(); ygglAttaZszjb.insertOrUpdate();
return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjb, "修改员工证书证件表成功");
} }
/** /**
...@@ -868,7 +871,7 @@ public class YgglController { ...@@ -868,7 +871,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaLxxxb>().lambda() .selectList(new QueryWrapper<YgglAttaLxxxb>().lambda()
.eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaLxxxb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaLxxxb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功"); return ResultUtil.data(ygglAttaLxxxbs);
} }
// 获取员工联系信息表 // 获取员工联系信息表
...@@ -880,7 +883,7 @@ public class YgglController { ...@@ -880,7 +883,7 @@ public class YgglController {
new QueryWrapper<YgglAttaLxxxb>().lambda() new QueryWrapper<YgglAttaLxxxb>().lambda()
.eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaLxxxb::getEmpNum, empNum)); .eq(YgglAttaLxxxb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功"); return ResultUtil.data(ygglAttaLxxxbs);
} }
/** /**
...@@ -896,7 +899,7 @@ public class YgglController { ...@@ -896,7 +899,7 @@ public class YgglController {
ygglAttaLxxxb.setEmpNum(ygglAttaLxxxb.getEmpNum()); ygglAttaLxxxb.setEmpNum(ygglAttaLxxxb.getEmpNum());
ygglAttaLxxxb.setOrgCode(userBean.getOrgCode()); ygglAttaLxxxb.setOrgCode(userBean.getOrgCode());
ygglAttaLxxxb.insertOrUpdate(); ygglAttaLxxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaLxxxb, "添加/修改员工联系信息表成功"); return ResultUtil.data(ygglAttaLxxxb, "修改员工联系信息表成功");
} }
/** /**
...@@ -930,7 +933,7 @@ public class YgglController { ...@@ -930,7 +933,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaJjlxr>().lambda() .selectList(new QueryWrapper<YgglAttaJjlxr>().lambda()
.eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaJjlxr::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaJjlxr::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功"); return ResultUtil.data(ygglAttaJjlxrs);
} }
// 获取员工紧急联系人表 // 获取员工紧急联系人表
...@@ -942,7 +945,7 @@ public class YgglController { ...@@ -942,7 +945,7 @@ public class YgglController {
new QueryWrapper<YgglAttaJjlxr>().lambda() new QueryWrapper<YgglAttaJjlxr>().lambda()
.eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaJjlxr::getEmpNum, empNum)); .eq(YgglAttaJjlxr::getEmpNum, empNum));
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功"); return ResultUtil.data(ygglAttaJjlxrs);
} }
/** /**
...@@ -958,7 +961,7 @@ public class YgglController { ...@@ -958,7 +961,7 @@ public class YgglController {
ygglAttaJjlxr.setEmpNum(ygglAttaJjlxr.getEmpNum()); ygglAttaJjlxr.setEmpNum(ygglAttaJjlxr.getEmpNum());
ygglAttaJjlxr.setOrgCode(userBean.getOrgCode()); ygglAttaJjlxr.setOrgCode(userBean.getOrgCode());
ygglAttaJjlxr.insertOrUpdate(); ygglAttaJjlxr.insertOrUpdate();
return ResultUtil.data(ygglAttaJjlxr, "添加/修改员工紧急联系人表成功"); return ResultUtil.data(ygglAttaJjlxr, "修改员工紧急联系人表成功");
} }
/** /**
...@@ -993,7 +996,7 @@ public class YgglController { ...@@ -993,7 +996,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaGzk>().lambda() .selectList(new QueryWrapper<YgglAttaGzk>().lambda()
.eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaGzk::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaGzk::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功"); return ResultUtil.data(ygglAttaGzks);
} }
// 获取工资卡信息 // 获取工资卡信息
...@@ -1005,7 +1008,7 @@ public class YgglController { ...@@ -1005,7 +1008,7 @@ public class YgglController {
new QueryWrapper<YgglAttaGzk>().lambda() new QueryWrapper<YgglAttaGzk>().lambda()
.eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaGzk::getEmpNum, empNum)); .eq(YgglAttaGzk::getEmpNum, empNum));
return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功"); return ResultUtil.data(ygglAttaGzks);
} }
/** /**
...@@ -1021,7 +1024,7 @@ public class YgglController { ...@@ -1021,7 +1024,7 @@ public class YgglController {
ygglAttaGzk.setEmpNum(ygglAttaGzk.getEmpNum()); ygglAttaGzk.setEmpNum(ygglAttaGzk.getEmpNum());
ygglAttaGzk.setOrgCode(userBean.getOrgCode()); ygglAttaGzk.setOrgCode(userBean.getOrgCode());
ygglAttaGzk.insertOrUpdate(); ygglAttaGzk.insertOrUpdate();
return ResultUtil.data(ygglAttaGzk, "添加/修改工资卡信息成功"); return ResultUtil.data(ygglAttaGzk, "修改工资卡信息成功");
} }
/** /**
...@@ -1055,7 +1058,7 @@ public class YgglController { ...@@ -1055,7 +1058,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaHtxxb>().lambda() .selectList(new QueryWrapper<YgglAttaHtxxb>().lambda()
.eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaHtxxb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaHtxxb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaHtxxbs);
} }
// 获取员工合同信息表 // 获取员工合同信息表
...@@ -1067,7 +1070,7 @@ public class YgglController { ...@@ -1067,7 +1070,7 @@ public class YgglController {
new QueryWrapper<YgglAttaHtxxb>().lambda() new QueryWrapper<YgglAttaHtxxb>().lambda()
.eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaHtxxb::getEmpNum, empNum)); .eq(YgglAttaHtxxb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaHtxxbs);
} }
/** /**
...@@ -1083,7 +1086,7 @@ public class YgglController { ...@@ -1083,7 +1086,7 @@ public class YgglController {
ygglAttaHtxxb.setEmpNum(ygglAttaHtxxb.getEmpNum()); ygglAttaHtxxb.setEmpNum(ygglAttaHtxxb.getEmpNum());
ygglAttaHtxxb.setOrgCode(userBean.getOrgCode()); ygglAttaHtxxb.setOrgCode(userBean.getOrgCode());
ygglAttaHtxxb.insertOrUpdate(); ygglAttaHtxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaHtxxb, "添加/修改员工合同信息表成功"); return ResultUtil.data(ygglAttaHtxxb, "修改员工合同信息表成功");
} }
/** /**
...@@ -1117,7 +1120,7 @@ public class YgglController { ...@@ -1117,7 +1120,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaClfjb>().lambda() .selectList(new QueryWrapper<YgglAttaClfjb>().lambda()
.eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaClfjb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaClfjb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功"); return ResultUtil.data(ygglAttaClfjbs);
} }
// 获取员工材料附件表 // 获取员工材料附件表
...@@ -1129,7 +1132,7 @@ public class YgglController { ...@@ -1129,7 +1132,7 @@ public class YgglController {
new QueryWrapper<YgglAttaClfjb>().lambda() new QueryWrapper<YgglAttaClfjb>().lambda()
.eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaClfjb::getEmpNum, empNum)); .eq(YgglAttaClfjb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功"); return ResultUtil.data(ygglAttaClfjbs);
} }
/** /**
...@@ -1145,7 +1148,7 @@ public class YgglController { ...@@ -1145,7 +1148,7 @@ public class YgglController {
ygglAttaClfjb.setOrgCode(userBean.getOrgCode()); ygglAttaClfjb.setOrgCode(userBean.getOrgCode());
ygglAttaClfjb.setEmpNum(ygglAttaClfjb.getEmpNum()); ygglAttaClfjb.setEmpNum(ygglAttaClfjb.getEmpNum());
ygglAttaClfjb.insertOrUpdate(); ygglAttaClfjb.insertOrUpdate();
return ResultUtil.data(ygglAttaClfjb, "添加/修改员工材料附件表成功"); return ResultUtil.data(ygglAttaClfjb, "修改员工材料附件表成功");
} }
/** /**
...@@ -1179,7 +1182,7 @@ public class YgglController { ...@@ -1179,7 +1182,7 @@ public class YgglController {
.selectList(new QueryWrapper<YgglAttaCzjlb>().lambda() .selectList(new QueryWrapper<YgglAttaCzjlb>().lambda()
.eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaCzjlb::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaCzjlb::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功"); return ResultUtil.data(ygglAttaCzjlbs);
} }
// 获取成长记录表 // 获取成长记录表
...@@ -1191,7 +1194,7 @@ public class YgglController { ...@@ -1191,7 +1194,7 @@ public class YgglController {
new QueryWrapper<YgglAttaCzjlb>().lambda() new QueryWrapper<YgglAttaCzjlb>().lambda()
.eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaCzjlb::getEmpNum, empNum)); .eq(YgglAttaCzjlb::getEmpNum, empNum));
return ResultUtil.data(ygglAttaCzjlbs, "获取员工成长记录表成功"); return ResultUtil.data(ygglAttaCzjlbs);
} }
/** /**
...@@ -1207,7 +1210,7 @@ public class YgglController { ...@@ -1207,7 +1210,7 @@ public class YgglController {
ygglAttaCzjlb.setEmpNum(ygglAttaCzjlb.getEmpNum()); ygglAttaCzjlb.setEmpNum(ygglAttaCzjlb.getEmpNum());
ygglAttaCzjlb.setOrgCode(userBean.getOrgCode()); ygglAttaCzjlb.setOrgCode(userBean.getOrgCode());
ygglAttaCzjlb.insertOrUpdate(); ygglAttaCzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功"); return ResultUtil.data(ygglAttaCzjlb, "修改成长记录表成功");
} }
/** /**
...@@ -1222,7 +1225,7 @@ public class YgglController { ...@@ -1222,7 +1225,7 @@ public class YgglController {
public Result<YgglMainLzb> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<YgglMainLzb> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
YgglMainLzb lzyg = new LambdaQueryChainWrapper<YgglMainLzb>(ygglMainLzbMapper) YgglMainLzb lzyg = new LambdaQueryChainWrapper<YgglMainLzb>(ygglMainLzbMapper)
.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()).eq(YgglMainLzb::getEmpNum, empNum).one(); .eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()).eq(YgglMainLzb::getEmpNum, empNum).one();
return ResultUtil.data(lzyg, "获取单个离职员工信息(管)成功"); return ResultUtil.data(lzyg);
} }
/** /**
...@@ -1239,7 +1242,7 @@ public class YgglController { ...@@ -1239,7 +1242,7 @@ public class YgglController {
YgglMainEmp.builder().jobStatus(jobStatus.ZHENSHI.getType()).zzTime(ygzzDto.getZzTime()).sjzzTime(new Date()) YgglMainEmp.builder().jobStatus(jobStatus.ZHENSHI.getType()).zzTime(ygzzDto.getZzTime()).sjzzTime(new Date())
.zzRemark(ygzzDto.getZzRemark()).build().update(new UpdateWrapper<YgglMainEmp>().lambda() .zzRemark(ygzzDto.getZzRemark()).build().update(new UpdateWrapper<YgglMainEmp>().lambda()
.eq(YgglMainEmp::getEmpNum, ygzzDto.getEmpNum())); .eq(YgglMainEmp::getEmpNum, ygzzDto.getEmpNum()));
return ResultUtil.success("转正成功！"); return ResultUtil.success("转正成功!");
} }
/** /**
...@@ -1339,7 +1342,7 @@ public class YgglController { ...@@ -1339,7 +1342,7 @@ public class YgglController {
.eq(YgglMainLzb::getEmpNum, ygglMainLzb.getEmpNum())); .eq(YgglMainLzb::getEmpNum, ygglMainLzb.getEmpNum()));
return ResultUtil.data(ygglMainLzb, "修改成功"); return ResultUtil.data(ygglMainLzb, "修改成功");
} }
return ResultUtil.error("请确认该员工是否存在！"); return ResultUtil.error("请确认该员工是否存在!");
} }
...@@ -1395,7 +1398,7 @@ public class YgglController { ...@@ -1395,7 +1398,7 @@ public class YgglController {
public Result<List<CommonArea>> selectNativePlace() { public Result<List<CommonArea>> selectNativePlace() {
List<CommonArea> listCommonArea = commonAreaMapper.AllAreaForTree(); List<CommonArea> listCommonArea = commonAreaMapper.AllAreaForTree();
return ResultUtil.data(listCommonArea, "操作成功!"); return ResultUtil.data(listCommonArea);
} }
...@@ -1415,7 +1418,7 @@ public class YgglController { ...@@ -1415,7 +1418,7 @@ public class YgglController {
yg.setHeadUrl(""); yg.setHeadUrl("");
} }
} }
return ResultUtil.data(ygQueryDto, "查询成功"); return ResultUtil.data(ygQueryDto);
} }
/*************** 统计图 ***************/ /*************** 统计图 ***************/
...@@ -1459,7 +1462,7 @@ public class YgglController { ...@@ -1459,7 +1462,7 @@ public class YgglController {
map.put("nativeplace", ygglCartogramDto10); map.put("nativeplace", ygglCartogramDto10);
map.put("workingAge", ygglCartogramDto11); map.put("workingAge", ygglCartogramDto11);
return ResultUtil.data(map, "查询成功"); return ResultUtil.data(map);
} }
/** /**
...@@ -1473,15 +1476,7 @@ public class YgglController { ...@@ -1473,15 +1476,7 @@ public class YgglController {
public Result<YgCartogramDto> ygCartogram(@CurrentUser UserBean userBean) { public Result<YgCartogramDto> ygCartogram(@CurrentUser UserBean userBean) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
List<YgbintuDto> bintu = ygglMainEmpMapper.rsybp(orgCode); List<YgbintuDto> bintu = ygglMainEmpMapper.rsybp(orgCode);
/*
* bintu.stream().filter(bean ->{ if (bean.getAge() == null) { bean.setAge(0); }
* if (bean.getBm() == null) { bean.setBm("未分配"); } if (bean.getGw() == null) {
* bean.setGw("未分配"); } if (bean.getProname() == null) { bean.setProname("未分配");
* } if (bean.getEduname() == null) { bean.setEduname("未分配"); } if
* (bean.getJobStatus() == null) { bean.setJobStatus(-1); } if
* (bean.getWorkage() == null) { bean.setWorkage(-1); } return true;
* }).collect(Collectors.toList());
*/
Map<String, Long> gw = bintu.stream().collect(Collectors.groupingBy(YgbintuDto::getGw, Collectors.counting())); Map<String, Long> gw = bintu.stream().collect(Collectors.groupingBy(YgbintuDto::getGw, Collectors.counting()));
List<YgKVDto> gwList = new ArrayList<YgKVDto>(); List<YgKVDto> gwList = new ArrayList<YgKVDto>();
for (Map.Entry<String, Long> entry : gw.entrySet()) { for (Map.Entry<String, Long> entry : gw.entrySet()) {
...@@ -1492,8 +1487,6 @@ public class YgglController { ...@@ -1492,8 +1487,6 @@ public class YgglController {
for (Map.Entry<String, Long> entry : bm.entrySet()) { for (Map.Entry<String, Long> entry : bm.entrySet()) {
bmList.add(new YgKVDto(entry.getKey(), entry.getValue().toString())); bmList.add(new YgKVDto(entry.getKey(), entry.getValue().toString()));
} }
// Map<String, Map<String, Long>> bmgw =
// bintu.stream().collect(Collectors.groupingBy(YgbintuDto::getBm,Collectors.groupingBy(YgbintuDto::getGw,Collectors.counting())));
Map<String, Long> edu = bintu.stream() Map<String, Long> edu = bintu.stream()
.collect(Collectors.groupingBy(YgbintuDto::getEduname, Collectors.counting())); .collect(Collectors.groupingBy(YgbintuDto::getEduname, Collectors.counting()));
List<YgKVDto> eduList = new ArrayList<YgKVDto>(); List<YgKVDto> eduList = new ArrayList<YgKVDto>();
...@@ -1547,7 +1540,7 @@ public class YgglController { ...@@ -1547,7 +1540,7 @@ public class YgglController {
ybp.setProname(pronameList); ybp.setProname(pronameList);
ybp.setWorkage(workageList); ybp.setWorkage(workageList);
ybp.setAge(ageList); ybp.setAge(ageList);
return ResultUtil.data(ybp, "获取员工管理统计图信息成功！"); return ResultUtil.data(ybp);
} }
/** /**
...@@ -1563,7 +1556,7 @@ public class YgglController { ...@@ -1563,7 +1556,7 @@ public class YgglController {
List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(new QueryWrapper<YgglAttaSbgjj>().lambda() List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(new QueryWrapper<YgglAttaSbgjj>().lambda()
.eq(YgglAttaSbgjj::getOrgCode, userBean.getOrgCode()) .eq(YgglAttaSbgjj::getOrgCode, userBean.getOrgCode())
.eq(YgglAttaSbgjj::getEmpNum, userBean.getEmpNum())); .eq(YgglAttaSbgjj::getEmpNum, userBean.getEmpNum()));
return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功"); return ResultUtil.data(ygglAttaSbgjj);
} }
/** /**
...@@ -1580,7 +1573,7 @@ public class YgglController { ...@@ -1580,7 +1573,7 @@ public class YgglController {
YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build() YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build()
.selectOne(new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getEmpNum, empNum)); .selectOne(new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getEmpNum, empNum));
return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功"); return ResultUtil.data(ygglAttaSbgjj);
} }
/** /**
...@@ -1605,7 +1598,7 @@ public class YgglController { ...@@ -1605,7 +1598,7 @@ public class YgglController {
ygglAttaSbgjj.insert(); ygglAttaSbgjj.insert();
} }
return ResultUtil.data(ygglAttaSbgjj, "添加/修改员工社保公积金成功"); return ResultUtil.data(ygglAttaSbgjj);
} }
/** /**
...@@ -1622,7 +1615,7 @@ public class YgglController { ...@@ -1622,7 +1615,7 @@ public class YgglController {
return ResultUtil.data(YgglAttaSbgjj.builder().build() return ResultUtil.data(YgglAttaSbgjj.builder().build()
.delete(new QueryWrapper<YgglAttaSbgjj>().lambda() .delete(new QueryWrapper<YgglAttaSbgjj>().lambda()
.eq(YgglAttaSbgjj::getOrgCode, orgCode) .eq(YgglAttaSbgjj::getOrgCode, orgCode)
.eq(YgglAttaSbgjj::getId, id)), "删除员工社保公积金成功"); .eq(YgglAttaSbgjj::getId, id)));
} }
@GetMapping(value = "/sysRegion") @GetMapping(value = "/sysRegion")
...@@ -1648,7 +1641,7 @@ public class YgglController { ...@@ -1648,7 +1641,7 @@ public class YgglController {
tree.putExtra("mer_name", treeNode.getMerName()); tree.putExtra("mer_name", treeNode.getMerName());
}); });
return ResultUtil.data(treeNodes, "获取成功"); return ResultUtil.data(treeNodes);
} }
/** /**
...@@ -1690,7 +1683,7 @@ public class YgglController { ...@@ -1690,7 +1683,7 @@ public class YgglController {
loginInfo.setEntryTime(ygglMainEmp.getRzTime()); loginInfo.setEntryTime(ygglMainEmp.getRzTime());
loginInfo.setRegularTime(ygglMainEmp.getRzTime()); loginInfo.setRegularTime(ygglMainEmp.getRzTime());
} }
return ResultUtil.data(loginInfo, "操作成功！"); return ResultUtil.data(loginInfo);
} }
/** /**
...@@ -1729,7 +1722,7 @@ public class YgglController { ...@@ -1729,7 +1722,7 @@ public class YgglController {
loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl())); loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
} }
Collections.reverse(loginerChargeDtos); Collections.reverse(loginerChargeDtos);
return ResultUtil.data(loginerChargeDtos, "获取上级部门的部门id"); return ResultUtil.data(loginerChargeDtos);
} }
// 根据传来的empNum获取该人员信息，没有则传全部 // 根据传来的empNum获取该人员信息，没有则传全部
...@@ -1779,7 +1772,7 @@ public class YgglController { ...@@ -1779,7 +1772,7 @@ public class YgglController {
yg.setHeadUrl(CommonEnum.NULL_STR.getDesc()); yg.setHeadUrl(CommonEnum.NULL_STR.getDesc());
} }
} }
return ResultUtil.data(yglList, "获取用户头像组成功"); return ResultUtil.data(yglList);
} }
} }
src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
...@@ -24,10 +24,8 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp ...@@ -24,10 +24,8 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
...@@ -107,10 +105,10 @@ public class ZzglController { ...@@ -107,10 +105,10 @@ public class ZzglController {
.eq(ZzglBmgwM::getOrgCode, orgCode).list(); .eq(ZzglBmgwM::getOrgCode, orgCode).list();
// 构建node列表 // 构建node列表
List<TreeNode<String>> nodeList = CollUtil.newArrayList(); // List<TreeNode<String>> nodeList = CollUtil.newArrayList();
zzglBmgwMs.forEach(z -> { // zzglBmgwMs.forEach(z -> {
nodeList.add(new TreeNode<>(Convert.toStr(z.getId()), Convert.toStr(z.getUpId()), z.getName(), 0)); // nodeList.add(new TreeNode<>(Convert.toStr(z.getId()), Convert.toStr(z.getUpId()), z.getName(), 0));
}); // });
//配置 //配置
TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
...@@ -277,10 +275,11 @@ public class ZzglController { ...@@ -277,10 +275,11 @@ public class ZzglController {
@Log(title = "删除岗位", businessType = BusinessType.DELETE) @Log(title = "删除岗位", businessType = BusinessType.DELETE)
public Result<Integer> deldepts(@CurrentUser UserBean userBean, @RequestBody List<Integer> ids) { public Result<Integer> deldepts(@CurrentUser UserBean userBean, @RequestBody List<Integer> ids) {
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build(); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.set("bmgw_id", null).in("bmgw_id", ids);
zzglLogDgjlMapper.insertbydeldept(ids, userBean.getEmpNum()); zzglLogDgjlMapper.insertbydeldept(ids, userBean.getEmpNum());
ygglMainEmp.update(updateWrapper); ygglMainEmp.update(new UpdateWrapper<YgglMainEmp>().lambda()
.set(YgglMainEmp::getBmgwId, null)
.in(YgglMainEmp::getBmgwId, ids));
zzglBmgwMMapper.deleteBatchIds(ids); zzglBmgwMMapper.deleteBatchIds(ids);
return ResultUtil.success(); return ResultUtil.success();
...@@ -298,13 +297,12 @@ public class ZzglController { ...@@ -298,13 +297,12 @@ public class ZzglController {
Integer dpetId = upEmpDeptDto.getDpetId(); Integer dpetId = upEmpDeptDto.getDpetId();
List<Integer> empNums = upEmpDeptDto.getEmpNum(); List<Integer> empNums = upEmpDeptDto.getEmpNum();
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build(); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
// zzglLogDgjlMapper
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.set("bmgw_id", dpetId).eq("org_code", userBean.getOrgCode()).in("emp_num", empNums);
zzglLogDgjlMapper.insertbyaddemp(empNums, userBean.getEmpNum(), dpetId, userBean.getOrgCode(), zzglLogDgjlMapper.insertbyaddemp(empNums, userBean.getEmpNum(), dpetId, userBean.getOrgCode(),
dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗"); dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗");
ygglMainEmp.update(updateWrapper); ygglMainEmp.update(new UpdateWrapper<YgglMainEmp>().lambda()
// zzglLogDgjlMapper.insert .set(YgglMainEmp::getBmgwId, dpetId)
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getEmpNum, empNums));
return ResultUtil.success(); return ResultUtil.success();
} }
...@@ -315,11 +313,12 @@ public class ZzglController { ...@@ -315,11 +313,12 @@ public class ZzglController {
empNums.add(empNum); empNums.add(empNum);
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build(); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.set("bmgw_id", dpetId).eq("org_code", orgCode).in("emp_num", empNum);
zzglLogDgjlMapper.insertbyaddemp(empNums, empNum, dpetId, orgCode, zzglLogDgjlMapper.insertbyaddemp(empNums, empNum, dpetId, orgCode,
dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗"); dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗");
ygglMainEmp.update(updateWrapper); ygglMainEmp.update(new UpdateWrapper<YgglMainEmp>().lambda()
.set(YgglMainEmp::getBmgwId, dpetId)
.eq(YgglMainEmp::getOrgCode, orgCode)
.in(YgglMainEmp::getEmpNum, empNum));
} }
/** /**
...@@ -458,7 +457,6 @@ public class ZzglController { ...@@ -458,7 +457,6 @@ public class ZzglController {
@ApiOperation(value = "删除-菜单权限", httpMethod = "DELETE", notes = "接口发布说明") @ApiOperation(value = "删除-菜单权限", httpMethod = "DELETE", notes = "接口发布说明")
public Result<List<ZzglMenu>> deletePostMenus(@Validated @RequestBody Integer id) { public Result<List<ZzglMenu>> deletePostMenus(@Validated @RequestBody Integer id) {
return zzglMenuMapper.deleteById(id) > 0 ? ResultUtil.success() : ResultUtil.error(); return zzglMenuMapper.deleteById(id) > 0 ? ResultUtil.success() : ResultUtil.error();
} }
......
src/main/java/cn/timer/api/manager/factory/AsyncFactory.java
...@@ -2,10 +2,6 @@ package cn.timer.api.manager.factory; ...@@ -2,10 +2,6 @@ package cn.timer.api.manager.factory;
import java.util.TimerTask; import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.hutool.extra.spring.SpringUtil;
import cn.timer.api.bean.qyzx.QyzxOperLog; import cn.timer.api.bean.qyzx.QyzxOperLog;
import cn.timer.api.controller.qyzx.service.QyzxOperLogService; import cn.timer.api.controller.qyzx.service.QyzxOperLogService;
import cn.timer.api.utils.AddressUtils; import cn.timer.api.utils.AddressUtils;
......
src/main/java/cn/timer/api/utils/DateFormatUtils.java
...@@ -511,36 +511,7 @@ public class DateFormatUtils { ...@@ -511,36 +511,7 @@ public class DateFormatUtils {
} }
public static void main(String[] args) throws ParseException { public static void main(String[] args) throws ParseException {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd EE");
System.out.println(df.format(new Date()));
//System.out.println(DateFormatUtils.getWeekNowDay());
/*
* System.out.println(getSystemDateByYYYYMMDDHHMMSSSSS());
* System.out.println(getSystemYY()); System.out.println(getSystemMM());
* System.out.println(getSystemDateByyymmdd());
*/
/*
* Long day = countAge("2015-10-20"); System.out.println(day.toString());
*/
/*
* Date date = getSystemDate(); System.out.println(date.toString());
*/
String s1 = "2008-01-25 09:12:11";
String s2 = "2008-01-25 09:12:09";
/*
* java.text.DateFormat df=new
* java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); java.util.Calendar
* c1=java.util.Calendar.getInstance(); java.util.Calendar
* c2=java.util.Calendar.getInstance(); try { c1.setTime(df.parse(s1));
* c2.setTime(df.parse(s2)); }catch(java.text.ParseException e){
* System.err.println("格式不正确"); } int result=c1.compareTo(c2); if(result==0)
* System.out.println("c1相等c2"); else if(result<0) System.out.println("c1小于c2");
* else System.out.println("c1大于c2");
*/
Date d1 = convertToDate(s2, "yyyy-MM-dd HH:mm:ss");
Date d2 = convertToDate(s1, "yyyy-MM-dd HH:mm:ss");
System.out.println(DateDifferentExample(d1, d2));
} }
} }
\ No newline at end of file
src/main/java/cn/timer/api/utils/RestTemplateUtil.java deleted 100644 → 0
package cn.timer.api.utils;
import javax.servlet.http.HttpSession;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import com.alibaba.fastjson.JSONObject;
/**
* @author Eangaie
* @date 2018/10/12 0012 下午 14:53 网络请求,RestTemplate工具类
*/
@Component
public class RestTemplateUtil {
@Autowired
private RestTemplate restTemplate;
@Autowired
private HttpSession session;
/**
* 发送GET请求
*
* @param url
* @param param
* @return
*/
public JSONObject GetData(String url, T param) {
// 请勿轻易改变此提交方式，大部分的情况下，提交方式都是表单提交
HttpHeaders headers = new HttpHeaders();
headers.add("appid", "4438775940");
headers.add("grantType", "refresh_token");
headers.add("refreshToken", "8b58973c290cc848b67ff0017cd424ff");
session.setAttribute("Content-Type", "application/json");
session.setAttribute("X-Tsign-Open-App-Id", "4438775940");
session.setAttribute("X-Tsign-Open-Token", "token");
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
@SuppressWarnings("unused")
HttpEntity<T> httpEntity = new HttpEntity<T>(param, headers);
return restTemplate.getForEntity(url, JSONObject.class, param).getBody();
}
/**
* 发送POST-JSON请求
*
* @param url
* @param param
* @return
*/
public String PostJsonData(String url, JSONObject param) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
headers.add("Accept", MediaType.APPLICATION_JSON.toString());
@SuppressWarnings("unused")
HttpEntity<JSONObject> requestEntity = new HttpEntity<JSONObject>(param, headers);
return restTemplate.postForEntity(url, param, String.class).getBody();
}
/**
* 发送POST 表单请求
*
* @param url
* @param param
* @return
*/
public String PostFormData(String url, MultiValueMap<String, String> param) {
// 请勿轻易改变此提交方式，大部分的情况下，提交方式都是表单提交
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
return restTemplate.postForEntity(url, param, String.class).getBody();
}
}
\ No newline at end of file
src/main/java/cn/timer/api/utils/Result.java
...@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; ...@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import lombok.Data; import lombok.Data;
/** /**
* @author Exrickx * @author Tang
* 前后端交互数据标准 * 前后端交互数据标准
*/ */
@Service("result") @Service("result")
......
src/main/java/cn/timer/api/utils/ResultUtil.java
...@@ -96,6 +96,19 @@ public class ResultUtil<T> { ...@@ -96,6 +96,19 @@ public class ResultUtil<T> {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Result<T> setData(T t1, T t2) {
this.result.setCurrent(((IPage) t1).getCurrent());
this.result.setPages(((IPage) t1).getPages());
this.result.setSize(((IPage) t1).getSize());
this.result.setTotal(((IPage) t1).getTotal());
this.result.setData(t2);
this.result.setCode(STATUS_CODE_SUCCESS);
this.result.setMessage(MESSAGE_SUCCESS);
return this.result;
}
@SuppressWarnings("rawtypes")
public Result<T> setData2(T t1, T t2, String msg) { public Result<T> setData2(T t1, T t2, String msg) {
this.result.setCurrent((long) ((com.github.pagehelper.Page) t1).getPageNum()); this.result.setCurrent((long) ((com.github.pagehelper.Page) t1).getPageNum());
...@@ -140,6 +153,11 @@ public class ResultUtil<T> { ...@@ -140,6 +153,11 @@ public class ResultUtil<T> {
return new ResultUtil<T>().setData(t); return new ResultUtil<T>().setData(t);
} }
public static <T> Result<T> data(T t1, T t2) {
return new ResultUtil<T>().setData(t1, t2);
}
public static <T> Result<T> data(T t1, T t2, String msg) { public static <T> Result<T> data(T t1, T t2, String msg) {
return new ResultUtil<T>().setData(t1, t2, msg); return new ResultUtil<T>().setData(t1, t2, msg);
......
src/main/java/cn/timer/api/utils/SerializationUtils.java deleted 100644 → 0
package cn.timer.api.utils;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
import java.util.List;
/**
* 反序列化
*
* @author Administrator
*/
public class SerializationUtils {
@SuppressWarnings("unchecked")
public static List<Object> toSerialization(byte[] object) {
try {
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(object);
ObjectInputStream in;
in = new ObjectInputStream(byteArrayInputStream);
List<Object> objectlist = (List<Object>) in.readObject();
in.close();
return objectlist;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public static Object toSerializationObject(byte[] object) {
try {
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(object);
ObjectInputStream in;
in = new ObjectInputStream(byteArrayInputStream);
Object objectlist = (Object) in.readObject();
in.close();
return objectlist;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
}
src/main/resources/generatorConfig.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<!-- 数据库驱动-->
<classPathEntry location="C:\Users\Administrator\.m2\repository\mysql\mysql-connector-java\5.1.37\mysql-connector-java-5.1.37.jar"/>
<context id="DB2Tables" targetRuntime="MyBatis3">
<commentGenerator>
<property name="suppressDate" value="true"/>
<!-- 是否去除自动生成的注释 true：是 ： false:否 -->
<property name="suppressAllComments" value="true"/>
</commentGenerator>
<!--数据库链接URL，用户名、密码 -->
<jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://120.24.172.51:3306/youlingrc-8timer201" userId="tang1" password="Tang123456!"/>
<javaTypeResolver>
<property name="forceBigDecimals" value="false"/>
</javaTypeResolver>
<!-- 生成模型的包名和位置-->
<javaModelGenerator targetPackage="com.eighttimer.service.bean" targetProject="D:\Tang\com.8timer.www\src">
<property name="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/>
</javaModelGenerator>
<!-- 生成映射文件的包名和位置-->
<sqlMapGenerator targetPackage="mapping" targetProject="D:\Tang\com.8timer.www\src">
<property name="enableSubPackages" value="true"/>
</sqlMapGenerator>
<!-- 生成DAO的包名和位置-->
<javaClientGenerator type="XMLMAPPER" targetPackage="com.eighttimer.service.dao" targetProject="D:\Tang\com.8timer.www\src">
<property name="enableSubPackages" value="true"/>
</javaClientGenerator>
<!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
<table tableName="test" domainObjectName="Test" enableCountByExample="false"
enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"
selectByExampleQueryId="false"></table>
</context>
</generatorConfiguration>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
where emp.org_code = #{orgcode} where emp.org_code = #{orgcode}
and emp.job_status in (0,1)
</select> </select>
<!-- <!--
......
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