diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java index 28c6d26..bacfc56 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java @@ -58,8 +58,14 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 表单id diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java index 28c6d26..bacfc56 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java @@ -58,8 +58,14 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 表单id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java index 9d1f2f0..8f0bfce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java @@ -25,14 +25,26 @@ /** * 培训时间 */ - @ApiModelProperty(value = "培训时间（查询出该时间前列表倒序）", dataType = "String") - private String trainTime; + @ApiModelProperty(value = "培训开始时间", dataType = "String") + private String trainStartTime; + + /** + * 培训时间 + */ + @ApiModelProperty(value = "培训结束时间", dataType = "String") + private String trainEndTime; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间（查询出该时间前列表倒序）", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 组织部门id-系统组织表 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java index 28c6d26..bacfc56 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java @@ -58,8 +58,14 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 表单id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java index 9d1f2f0..8f0bfce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java @@ -25,14 +25,26 @@ /** * 培训时间 */ - @ApiModelProperty(value = "培训时间（查询出该时间前列表倒序）", dataType = "String") - private String trainTime; + @ApiModelProperty(value = "培训开始时间", dataType = "String") + private String trainStartTime; + + /** + * 培训时间 + */ + @ApiModelProperty(value = "培训结束时间", dataType = "String") + private String trainEndTime; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间（查询出该时间前列表倒序）", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 组织部门id-系统组织表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 3bd316c..585a207 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -215,13 +215,7 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - Map resultMap = SqlRunner.db().selectOne( - "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + - "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + - "JOIN sys_user su ON srr.USERID = su.ID " + - "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + - "WHERE su.ID = {0}" + - "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + Map resultMap = selectDirectDept(user); if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){ return new Page<>(); } @@ -390,16 +384,7 @@ Long maxNo = labExecutiveTemplateInfoMapper.selectMaxTemplateNo(); for (int i = 0; i < labExecutiveInfos.size(); i++) { BusinessLabExecutiveInfo lab = labExecutiveInfos.get(i); - BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); - String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); - templateInfo.setTemplateCode(templateCode); -// templateInfo.setSampleTypeId(); - templateInfo.setSampleId(lab.getSampleId()); - templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); - templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); -// templateInfo.setMeasureItem(); - templateInfo.setExecuteSequence(lab.getMeasureSequence()); -// templateInfo.setCreateUser(); + BusinessLabExecutiveTemplateInfo templateInfo = getBusinessLabExecutiveTemplateInfo(maxNo, i, lab); labList.add(templateInfo); } if(labExecutiveTemplateInfoService.saveBatch(labList)) log.info("实验室检测记录批量保存为实验室检测模板成功"); @@ -422,6 +407,20 @@ throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } + private BusinessLabExecutiveTemplateInfo getBusinessLabExecutiveTemplateInfo(Long maxNo, int i, BusinessLabExecutiveInfo lab) { + BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); + String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); + templateInfo.setTemplateCode(templateCode); +// templateInfo.setSampleTypeId(); + templateInfo.setSampleId(lab.getSampleId()); + templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); + templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); +// templateInfo.setMeasureItem(); + templateInfo.setExecuteSequence(lab.getMeasureSequence()); +// templateInfo.setCreateUser(); + return templateInfo; + } + @Override public ReturnDTO updateExecutiveList(UpdateExecutiveListRequest request) { //删除前端已删除的ids @@ -469,7 +468,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -510,7 +508,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -518,15 +515,7 @@ //删除实验室检测列表中退回数据 int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId()); //退回操作记录表中增加数据 - BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); - operateLog.setOrderId(request.getOrderId()); - operateLog.setSampleId(request.getSampleId()); - operateLog.setMeasureDeptId(request.getMeasureSegmentId()); - operateLog.setMeasurePersonId(request.getMeasurePersonId()); - operateLog.setOperatePersonId(userId); - operateLog.setOperatePersonName(user.getName()); - operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); - operateLog.setOperateReason(request.getOperateReason()); + BusinessLabExecutiveOperateLog operateLog = getBusinessLabExecutiveOperateLog(request, user, userId); int insertFlag = labExecutiveOperateLogMapper.insert(operateLog); if(deleteFlag > 0 && insertFlag > 0){ //退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1） @@ -596,4 +585,29 @@ } }); } + + private Map selectDirectDept(AuthUser user) { + Map resultMap = SqlRunner.db().selectOne( + "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + + "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + + "JOIN sys_user su ON srr.USERID = su.ID " + + "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + + "WHERE su.ID = {0}" + + "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + return resultMap; + } + + private BusinessLabExecutiveOperateLog getBusinessLabExecutiveOperateLog(ExecutiveSendBackRequest request, AuthUser user, Long userId) { + BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); + operateLog.setOrderId(request.getOrderId()); + operateLog.setSampleId(request.getSampleId()); + operateLog.setMeasureDeptId(request.getMeasureSegmentId()); + operateLog.setMeasurePersonId(request.getMeasurePersonId()); + operateLog.setOperatePersonId(userId); + operateLog.setOperatePersonName(user.getName()); + operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); + operateLog.setOperateReason(request.getOperateReason()); + return operateLog; + } + } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java index 28c6d26..bacfc56 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java @@ -58,8 +58,14 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 表单id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java index 9d1f2f0..8f0bfce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java @@ -25,14 +25,26 @@ /** * 培训时间 */ - @ApiModelProperty(value = "培训时间（查询出该时间前列表倒序）", dataType = "String") - private String trainTime; + @ApiModelProperty(value = "培训开始时间", dataType = "String") + private String trainStartTime; + + /** + * 培训时间 + */ + @ApiModelProperty(value = "培训结束时间", dataType = "String") + private String trainEndTime; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间（查询出该时间前列表倒序）", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 组织部门id-系统组织表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 3bd316c..585a207 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -215,13 +215,7 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - Map resultMap = SqlRunner.db().selectOne( - "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + - "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + - "JOIN sys_user su ON srr.USERID = su.ID " + - "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + - "WHERE su.ID = {0}" + - "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + Map resultMap = selectDirectDept(user); if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){ return new Page<>(); } @@ -390,16 +384,7 @@ Long maxNo = labExecutiveTemplateInfoMapper.selectMaxTemplateNo(); for (int i = 0; i < labExecutiveInfos.size(); i++) { BusinessLabExecutiveInfo lab = labExecutiveInfos.get(i); - BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); - String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); - templateInfo.setTemplateCode(templateCode); -// templateInfo.setSampleTypeId(); - templateInfo.setSampleId(lab.getSampleId()); - templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); - templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); -// templateInfo.setMeasureItem(); - templateInfo.setExecuteSequence(lab.getMeasureSequence()); -// templateInfo.setCreateUser(); + BusinessLabExecutiveTemplateInfo templateInfo = getBusinessLabExecutiveTemplateInfo(maxNo, i, lab); labList.add(templateInfo); } if(labExecutiveTemplateInfoService.saveBatch(labList)) log.info("实验室检测记录批量保存为实验室检测模板成功"); @@ -422,6 +407,20 @@ throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } + private BusinessLabExecutiveTemplateInfo getBusinessLabExecutiveTemplateInfo(Long maxNo, int i, BusinessLabExecutiveInfo lab) { + BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); + String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); + templateInfo.setTemplateCode(templateCode); +// templateInfo.setSampleTypeId(); + templateInfo.setSampleId(lab.getSampleId()); + templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); + templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); +// templateInfo.setMeasureItem(); + templateInfo.setExecuteSequence(lab.getMeasureSequence()); +// templateInfo.setCreateUser(); + return templateInfo; + } + @Override public ReturnDTO updateExecutiveList(UpdateExecutiveListRequest request) { //删除前端已删除的ids @@ -469,7 +468,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -510,7 +508,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -518,15 +515,7 @@ //删除实验室检测列表中退回数据 int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId()); //退回操作记录表中增加数据 - BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); - operateLog.setOrderId(request.getOrderId()); - operateLog.setSampleId(request.getSampleId()); - operateLog.setMeasureDeptId(request.getMeasureSegmentId()); - operateLog.setMeasurePersonId(request.getMeasurePersonId()); - operateLog.setOperatePersonId(userId); - operateLog.setOperatePersonName(user.getName()); - operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); - operateLog.setOperateReason(request.getOperateReason()); + BusinessLabExecutiveOperateLog operateLog = getBusinessLabExecutiveOperateLog(request, user, userId); int insertFlag = labExecutiveOperateLogMapper.insert(operateLog); if(deleteFlag > 0 && insertFlag > 0){ //退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1） @@ -596,4 +585,29 @@ } }); } + + private Map selectDirectDept(AuthUser user) { + Map resultMap = SqlRunner.db().selectOne( + "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + + "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + + "JOIN sys_user su ON srr.USERID = su.ID " + + "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + + "WHERE su.ID = {0}" + + "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + return resultMap; + } + + private BusinessLabExecutiveOperateLog getBusinessLabExecutiveOperateLog(ExecutiveSendBackRequest request, AuthUser user, Long userId) { + BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); + operateLog.setOrderId(request.getOrderId()); + operateLog.setSampleId(request.getSampleId()); + operateLog.setMeasureDeptId(request.getMeasureSegmentId()); + operateLog.setMeasurePersonId(request.getMeasurePersonId()); + operateLog.setOperatePersonId(userId); + operateLog.setOperatePersonName(user.getName()); + operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); + operateLog.setOperateReason(request.getOperateReason()); + return operateLog; + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index e1b46b4..ba6a600 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -340,7 +340,7 @@ public ReturnDTO queryUseLogList(Long id) throws Exception { List logList = equipmentUseLogMapper.queryUseLogList(id); for (EquipmentUseLog equipmentUseLog : logList) { - DictCodeUtils.validDictCode(equipmentUseLog); + DictCodeUtils.convertDictCodeToName(equipmentUseLog); if(!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())){ equipmentUseLog.setEndDate("至今"); } @@ -352,7 +352,7 @@ public ReturnDTO queryStateChangeLogList(Long id) throws Exception { List logList = stateChangeLogMapper.queryStateChangeLogList(id); for (EquipmentStateChangeLog stateChangeLog : logList) { - DictCodeUtils.validDictCode(stateChangeLog); + DictCodeUtils.convertDictCodeToName(stateChangeLog); if(!StringUtils.isNotEmpty(stateChangeLog.getEndDate())){ stateChangeLog.setEndDate("至今"); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 758d2f9..d8f6d2e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -69,8 +69,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} @@ -93,8 +96,11 @@ and create_user like concat('%',#{request.createUser},'%') - - and create_time <= #{request.createTime} + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and id in diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 09eee0f..c4b3d7a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -67,11 +67,17 @@ WHERE is_del = 0 AND approval_status = #{request.approvalStatus} AND create_user_id = #{request.createUserId} - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} @@ -88,11 +94,17 @@ SELECT * FROM meter_train_plan WHERE is_del = 0 - - and train_time <= #{request.trainTime} + + and train_time >= #{request.trainStartTime} - - and create_time <= #{request.createTime} + + and train_time <= #{request.trainEndTime} + + + and create_time >= #{request.createStartTime} + + + and create_time <= #{request.createEndTime} and dept_id = #{request.deptId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java index 28c6d26..bacfc56 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java @@ -58,8 +58,14 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 表单id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java index 9d1f2f0..8f0bfce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java @@ -25,14 +25,26 @@ /** * 培训时间 */ - @ApiModelProperty(value = "培训时间（查询出该时间前列表倒序）", dataType = "String") - private String trainTime; + @ApiModelProperty(value = "培训开始时间", dataType = "String") + private String trainStartTime; + + /** + * 培训时间 + */ + @ApiModelProperty(value = "培训结束时间", dataType = "String") + private String trainEndTime; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间（查询出该时间前列表倒序）", dataType = "String") - private String createTime; + @ApiModelProperty(value = "创建开始时间", dataType = "String") + private String createStartTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建结束时间", dataType = "String") + private String createEndTime; /** * 组织部门id-系统组织表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 3bd316c..585a207 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -215,13 +215,7 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - Map resultMap = SqlRunner.db().selectOne( - "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + - "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + - "JOIN sys_user su ON srr.USERID = su.ID " + - "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + - "WHERE su.ID = {0}" + - "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + Map resultMap = selectDirectDept(user); if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){ return new Page<>(); } @@ -390,16 +384,7 @@ Long maxNo = labExecutiveTemplateInfoMapper.selectMaxTemplateNo(); for (int i = 0; i < labExecutiveInfos.size(); i++) { BusinessLabExecutiveInfo lab = labExecutiveInfos.get(i); - BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); - String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); - templateInfo.setTemplateCode(templateCode); -// templateInfo.setSampleTypeId(); - templateInfo.setSampleId(lab.getSampleId()); - templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); - templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); -// templateInfo.setMeasureItem(); - templateInfo.setExecuteSequence(lab.getMeasureSequence()); -// templateInfo.setCreateUser(); + BusinessLabExecutiveTemplateInfo templateInfo = getBusinessLabExecutiveTemplateInfo(maxNo, i, lab); labList.add(templateInfo); } if(labExecutiveTemplateInfoService.saveBatch(labList)) log.info("实验室检测记录批量保存为实验室检测模板成功"); @@ -422,6 +407,20 @@ throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } + private BusinessLabExecutiveTemplateInfo getBusinessLabExecutiveTemplateInfo(Long maxNo, int i, BusinessLabExecutiveInfo lab) { + BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); + String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); + templateInfo.setTemplateCode(templateCode); +// templateInfo.setSampleTypeId(); + templateInfo.setSampleId(lab.getSampleId()); + templateInfo.setMeasureDeptId(lab.getMeasureDeptId()); + templateInfo.setMeasurePersonId(lab.getMeasurePersonId()); +// templateInfo.setMeasureItem(); + templateInfo.setExecuteSequence(lab.getMeasureSequence()); +// templateInfo.setCreateUser(); + return templateInfo; + } + @Override public ReturnDTO updateExecutiveList(UpdateExecutiveListRequest request) { //删除前端已删除的ids @@ -469,7 +468,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -510,7 +508,6 @@ Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); - //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); @@ -518,15 +515,7 @@ //删除实验室检测列表中退回数据 int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId()); //退回操作记录表中增加数据 - BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); - operateLog.setOrderId(request.getOrderId()); - operateLog.setSampleId(request.getSampleId()); - operateLog.setMeasureDeptId(request.getMeasureSegmentId()); - operateLog.setMeasurePersonId(request.getMeasurePersonId()); - operateLog.setOperatePersonId(userId); - operateLog.setOperatePersonName(user.getName()); - operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); - operateLog.setOperateReason(request.getOperateReason()); + BusinessLabExecutiveOperateLog operateLog = getBusinessLabExecutiveOperateLog(request, user, userId); int insertFlag = labExecutiveOperateLogMapper.insert(operateLog); if(deleteFlag > 0 && insertFlag > 0){ //退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1） @@ -596,4 +585,29 @@ } }); } + + private Map selectDirectDept(AuthUser user) { + Map resultMap = SqlRunner.db().selectOne( + "SELECT su.DEPT_ID as deptId, sd.SIMPLE_NAME AS deptName FROM sys_role sr " + + "JOIN sys_ru_relation srr ON sr.ID = srr.ROLEID " + + "JOIN sys_user su ON srr.USERID = su.ID " + + "JOIN sys_dept sd ON su.DEPT_ID = sd.ID " + + "WHERE su.ID = {0}" + + "AND sr.TIPS = {1}", String.valueOf(user.getId()), "director"); + return resultMap; + } + + private BusinessLabExecutiveOperateLog getBusinessLabExecutiveOperateLog(ExecutiveSendBackRequest request, AuthUser user, Long userId) { + BusinessLabExecutiveOperateLog operateLog = new BusinessLabExecutiveOperateLog(); + operateLog.setOrderId(request.getOrderId()); + operateLog.setSampleId(request.getSampleId()); + operateLog.setMeasureDeptId(request.getMeasureSegmentId()); + operateLog.setMeasurePersonId(request.getMeasurePersonId()); + operateLog.setOperatePersonId(userId); + operateLog.setOperatePersonName(user.getName()); + operateLog.setMeasureStatus(MeasureStatusEnum.SEND_BACK); + operateLog.setOperateReason(request.getOperateReason()); + return operateLog; + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index e1b46b4..ba6a600 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -340,7 +340,7 @@ public ReturnDTO queryUseLogList(Long id) throws Exception { List logList = equipmentUseLogMapper.queryUseLogList(id); for (EquipmentUseLog equipmentUseLog : logList) { - DictCodeUtils.validDictCode(equipmentUseLog); + DictCodeUtils.convertDictCodeToName(equipmentUseLog); if(!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())){ equipmentUseLog.setEndDate("至今"); } @@ -352,7 +352,7 @@ public ReturnDTO queryStateChangeLogList(Long id) throws Exception { List logList = stateChangeLogMapper.queryStateChangeLogList(id); for (EquipmentStateChangeLog stateChangeLog : logList) { - DictCodeUtils.validDictCode(stateChangeLog); + DictCodeUtils.convertDictCodeToName(stateChangeLog); if(!StringUtils.isNotEmpty(stateChangeLog.getEndDate())){ stateChangeLog.setEndDate("至今"); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index ba06aff..7aee13e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -124,7 +124,7 @@ .name(name) // .category("")//自定义类别 .deploy(); - log.info("流程定义部署，flowable return deploy；{}", JSONObject.toJSONString(deploy)); + log.info("流程定义部署，flowable return deploy：{}", JSONObject.toJSONString(deploy)); if (Objects.isNull(deploy)) { return ReturnUtil.failed("流程定义部署失败"); }