From b9227cf15797221d0d0ad433b47489a73ab81a33 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 15 Dec 2020 16:31:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/ResultRecordServiceImpl.java | 11 ++++++++ src/main/resources/2020_12_08_sql | 26 ++++++++++++------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 67472279..f3125b8d 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -941,6 +941,7 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(),f.getFlowIndex()); boolean flag = false ; for(FlowRecord flowRecord:flowRecords){ @@ -963,8 +964,10 @@ public class ResultRecordServiceImpl extends ServiceImpl newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId()); @@ -983,6 +986,7 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Tue, 15 Dec 2020 16:50:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/ResultRecordServiceImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index f3125b8d..16d1eccd 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -968,7 +968,6 @@ public class ResultRecordServiceImpl extends ServiceImpl newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId()); for(int i = 0 ;i < newflowRecords.size() ; i ++){ @@ -985,12 +984,12 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId); + List flowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId); List flowRecordIds =new ArrayList<>(); boolean flag = false ; for(FlowRecord f: flowRecords){ @@ -1000,9 +999,9 @@ public class ResultRecordServiceImpl extends ServiceImpl newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId); + flowRecordService.deleteFlowRecordByRecordId(resultRecordId); + initFlowRecord(resultRecordId); + List newflowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId); for(int i = 0 ;i < newflowRecords.size() ; i ++){ flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i)); if(flag ){ //如果录入己经走了，设置新的数据，结果录入己走 @@ -1015,12 +1014,12 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Tue, 15 Dec 2020 17:04:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8D=E6=9B=B4=E6=96=B0record=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index cdac9256..71032008 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -978,7 +978,7 @@ public class ResultRecordController extends AbstractController { resultScoreService.updateBatchById(updateScores); } - resultRecordService.updateResultRecordById(resultRecord); + //resultRecordService.updateResultRecordById(resultRecord); if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 From 9b0983f7c05647ecdb2bbb175898150cccb12a50 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 17:16:48 +0800 Subject: [PATCH 4/8] =?UTF-8?q?record=E5=8F=AA=E6=9B=B4=E6=96=B0=E8=AF=84?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 71032008..3a893607 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -798,8 +798,10 @@ public class ResultRecordController extends AbstractController { @ApiOperation("保存绩效详情-吴林") public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) { Long userId = getUserId(); - ResultRecord resultRecord = new ResultRecord(); + //ResultRecord resultRecord = new ResultRecord(); + ResultRecord resultRecord = resultRecordService.selectResultRecordById(dto.getId()); BeanUtils.copyProperties(dto, resultRecord); + //resultRecord. resultRecord.setAllScore(resultRecord.getLastScore()); List inserts = new ArrayList<>(); List updates = new ArrayList<>(); @@ -978,7 +980,7 @@ public class ResultRecordController extends AbstractController { resultScoreService.updateBatchById(updateScores); } - //resultRecordService.updateResultRecordById(resultRecord); + resultRecordService.updateResultRecordById(resultRecord); if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 From 3c43aef7cc456971be2d8f77c89558d6a0f5f5d5 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 17:22:07 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 3a893607..b63c678b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -800,8 +800,7 @@ public class ResultRecordController extends AbstractController { Long userId = getUserId(); //ResultRecord resultRecord = new ResultRecord(); ResultRecord resultRecord = resultRecordService.selectResultRecordById(dto.getId()); - BeanUtils.copyProperties(dto, resultRecord); - //resultRecord. + resultRecord.setAllScore(resultRecord.getLastScore()); List inserts = new ArrayList<>(); List updates = new ArrayList<>(); From d931366345516793364f15f1f4f42ce318dac0f7 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 16 Dec 2020 11:09:39 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/dao/ScheduleJobDao.java | 3 +++ .../modules/job/service/impl/ScheduleJobServiceImpl.java | 8 +++++++- src/main/resources/mapper/job/ScheduleJobDao.xml | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/job/dao/ScheduleJobDao.java b/src/main/java/com/lz/modules/job/dao/ScheduleJobDao.java index 4b277a76..12b3cf3b 100644 --- a/src/main/java/com/lz/modules/job/dao/ScheduleJobDao.java +++ b/src/main/java/com/lz/modules/job/dao/ScheduleJobDao.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.job.entity.ScheduleJobEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -26,4 +27,6 @@ public interface ScheduleJobDao extends BaseMapper { * 批量更新状态 */ int updateBatch(Map map); + + List selectAll(); } diff --git a/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java index 6d33f1d1..c4c2487f 100644 --- a/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/lz/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -33,12 +33,18 @@ public class ScheduleJobServiceImpl extends ServiceImpl scheduleJobList = this.list(); + List scheduleJobList = scheduleJobMapper.selectAll(); for(ScheduleJobEntity scheduleJob : scheduleJobList){ CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getJobId()); //如果不存在，则创建 diff --git a/src/main/resources/mapper/job/ScheduleJobDao.xml b/src/main/resources/mapper/job/ScheduleJobDao.xml index 5c35544c..603ec916 100644 --- a/src/main/resources/mapper/job/ScheduleJobDao.xml +++ b/src/main/resources/mapper/job/ScheduleJobDao.xml @@ -11,4 +11,10 @@ + + + + From ddc7cbaab899e18f46d845f1fe60e7ef83e9001a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 16 Dec 2020 11:21:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 16d1eccd..ede99e92 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1463,7 +1463,7 @@ public class ResultRecordServiceImpl extends ServiceImpl resetDataResps = new ArrayList<>(); From 695393bcbfd967f315d2267d6c490a400913ecf8 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 16 Dec 2020 14:16:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E6=9C=9F=E4=BA=BA=E7=9C=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/common/utils/DingTalkUtil.java | 2 +- .../app/controller/ResultRecordController.java | 1 + .../modules/job/business/DingtalkBusiness.java | 16 +++++++++------- src/test/java/com/lz/mysql/ControlScanner.java | 7 +++++++ src/test/java/com/lz/mysql/SourceData.java | 8 ++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 src/test/java/com/lz/mysql/ControlScanner.java create mode 100644 src/test/java/com/lz/mysql/SourceData.java diff --git a/src/main/java/com/lz/common/utils/DingTalkUtil.java b/src/main/java/com/lz/common/utils/DingTalkUtil.java index 67563ec6..ead7f0f6 100644 --- a/src/main/java/com/lz/common/utils/DingTalkUtil.java +++ b/src/main/java/com/lz/common/utils/DingTalkUtil.java @@ -324,7 +324,7 @@ public class DingTalkUtil { departmentStaffBo.setEmail(json.getString("email"));//邮箱，钉钉的企业邮箱才可以，需要单独授权手机权限 departmentStaffBo.setAvatar(json.getString("avatar"));//头像 departmentStaffBo.setPosition(json.getString("title")); - if(mapProbation.containsKey(departmentStaffBo.getEmployeeId())){ + if(mapProbation != null && mapProbation.containsKey(departmentStaffBo.getEmployeeId())){ departmentStaffBo.setEmployeeType(2); }else{ departmentStaffBo.setEmployeeType(1); diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index b63c678b..049b6fc9 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -843,6 +843,7 @@ public class ResultRecordController extends AbstractController { /*if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); }*/ + for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 ResultDetail resultDetail = new ResultDetail(); diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 6b37868a..93f5950d 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -203,8 +203,11 @@ public class DingtalkBusiness { if(departmentInfosBos.size() > 0){ List probationUserIDS = getProbationStaff(token);//获取试用期人员信息 - Map mapProbation = - probationUserIDS.stream().collect(Collectors.toMap(String::toString, Function.identity(), (e, r) -> e)); + Map mapProbation = null; + if(probationUserIDS != null){ + mapProbation = probationUserIDS.stream().collect(Collectors.toMap(String::toString, Function.identity(), (e, r) -> e)); + } + //获取原有部门信息 Map mapDepartmentInfosBos = departmentInfosBos.stream().collect(Collectors.toMap(DepartmentInfosBo::getId, Function.identity(), (e, r) -> e)); @@ -574,7 +577,7 @@ public class DingtalkBusiness { private List getProbationStaff(String token){ //获取试用期员工信息 - + List ids = null; try { DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/smartwork/hrm/employee/queryonjob"); OapiSmartworkHrmEmployeeQueryonjobRequest req = new OapiSmartworkHrmEmployeeQueryonjobRequest(); @@ -582,7 +585,7 @@ public class DingtalkBusiness { req.setStatusList("2"); req.setSize(50L); boolean isNext = false; - List ids = new ArrayList<>(); + ids = new ArrayList<>(); { req.setOffset(offSet); OapiSmartworkHrmEmployeeQueryonjobResponse rsp = client.execute(req, token); @@ -599,13 +602,12 @@ public class DingtalkBusiness { }else{ logger.info("钉钉请求返回错误{}", jsonObject); } - }while(isNext) - return ids; + }while(isNext); } catch (ApiException e) { e.printStackTrace(); } - return null; + return ids; } diff --git a/src/test/java/com/lz/mysql/ControlScanner.java b/src/test/java/com/lz/mysql/ControlScanner.java new file mode 100644 index 00000000..6ea3aed7 --- /dev/null +++ b/src/test/java/com/lz/mysql/ControlScanner.java @@ -0,0 +1,7 @@ +package com.lz.mysql; + +public class ControlScanner { + private String filePath;//文件地址 + static final String[] notesSym = {"/*", "*/", "//", "\\n"};//注释符号，成对出现，偶数为起始符号，奇数为结束符号 + +} diff --git a/src/test/java/com/lz/mysql/SourceData.java b/src/test/java/com/lz/mysql/SourceData.java new file mode 100644 index 00000000..d321dc41 --- /dev/null +++ b/src/test/java/com/lz/mysql/SourceData.java @@ -0,0 +1,8 @@ +package com.lz.mysql; + +public class SourceData { + private String[] remarks; + private String name;//属性或者方法名称 + private String[] params;//参数名称 + private String reParam;//返回参数 +}