diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml index ceea930..9ffb414 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml @@ -16,11 +16,12 @@ select * from( - WITH r AS ( - SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid - UNION - SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info - ) + with r1 as ( + SELECT DISTINCT rfid, dept_id AS deptId FROM eqpt_equipment_info where rfid is not null + ), r2 as ( + SELECT DISTINCT rfid, create_user_dept AS deptId FROM eqpt_system_rfid + where rfid not in (select rfid from r1) + ), r AS ( SELECT DISTINCT rfid, deptId FROM r1 UNION ALL SELECT rfid, deptId FROM r2 ) SELECT r.rfid as rfid, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java index 85517a2..b432aa5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java @@ -43,6 +43,12 @@ @TableField("create_time") private Date createTime; + @TableField("create_user_id") + private Long createUserId; + + @TableField("create_user_dept") + private Long createUserDept; + public SystemRfid(String rfid) { this.rfid = rfid; } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml index ceea930..9ffb414 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml @@ -16,11 +16,12 @@ select * from( - WITH r AS ( - SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid - UNION - SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info - ) + with r1 as ( + SELECT DISTINCT rfid, dept_id AS deptId FROM eqpt_equipment_info where rfid is not null + ), r2 as ( + SELECT DISTINCT rfid, create_user_dept AS deptId FROM eqpt_system_rfid + where rfid not in (select rfid from r1) + ), r AS ( SELECT DISTINCT rfid, deptId FROM r1 UNION ALL SELECT rfid, deptId FROM r2 ) SELECT r.rfid as rfid, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java index 85517a2..b432aa5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java @@ -43,6 +43,12 @@ @TableField("create_time") private Date createTime; + @TableField("create_user_id") + private Long createUserId; + + @TableField("create_user_dept") + private Long createUserDept; + public SystemRfid(String rfid) { this.rfid = rfid; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index e00f517..bd07588 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -34,10 +34,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; +import java.util.*; import static com.casic.missiles.enums.ApprovalTypeEnum.*; @@ -117,6 +114,15 @@ String prefix = EQUIPMENT_TYPE_NORMAL.equals(approvalForm.getEquipmentType()) ? PrefixCodeEnum.EQUIPMENT_PREFIX : PrefixCodeEnum.EQUIPMENT_SPECIAL_PREFIX; approvalForm.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo)); } + // 1.1 设置证书有效性 + if(ObjectUtil.isEmpty(approvalForm.getCertificateValid())){ + if(ObjectUtil.isNotEmpty(approvalForm.getCheckDate())){ + Calendar cal = Calendar.getInstance(); + cal.setTime(approvalForm.getCheckDate()); + cal.add(Calendar.MONTH,approvalForm.getCheckCycle()); + approvalForm.setCertificateValid(cal.getTime()); + } + } // 2. 设置申请状态：草稿箱 approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT); // 3. 保存扩展表 @@ -275,6 +281,24 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsageStatus()), "usage_status", queryForm.getUsageStatus()); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "certificate_valid", queryForm.getCertificateValidStart()); queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); + + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"manufacture_no",queryForm.getManufactureNo()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()),"director_name",queryForm.getDirectorName()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUseSign()),"use_sign",queryForm.getUseSign()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocation()),"CONCAT(install_location,install_location_ext)",queryForm.getInstallLocation()); + + if(ObjectUtil.isNotEmpty(queryForm.getTaskId())){ + String existSql = String.format("(select id from eqpt_equipment_task_relation where task_id = %d and equipment_id = eqpt_equipment_info.id)",queryForm.getTaskId()); + queryWrapper.exists(existSql); + } + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()),"check_organization",queryForm.getCheckOrganization()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()),"meter_identify",queryForm.getMeterIdentify()); + queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()),"check_date",queryForm.getCheckDateStart()); + queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()),"check_date",queryForm.getCheckDateEnd()); + + return queryWrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index fa01eb3..6d710c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -332,7 +332,7 @@ this.saveBatch(equipmentInfos); } if (CollUtil.isNotEmpty(technicalTargets)) { - technicalTargetService.saveBatch(technicalTargets); + //technicalTargetService.saveBatch(technicalTargets); } for (EquipmentInfo equipmentInfo : equipmentInfos) { turnoverLogService.saveLog(equipmentInfo, null, user.getId()); diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml index ceea930..9ffb414 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml @@ -16,11 +16,12 @@ select * from( - WITH r AS ( - SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid - UNION - SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info - ) + with r1 as ( + SELECT DISTINCT rfid, dept_id AS deptId FROM eqpt_equipment_info where rfid is not null + ), r2 as ( + SELECT DISTINCT rfid, create_user_dept AS deptId FROM eqpt_system_rfid + where rfid not in (select rfid from r1) + ), r AS ( SELECT DISTINCT rfid, deptId FROM r1 UNION ALL SELECT rfid, deptId FROM r2 ) SELECT r.rfid as rfid, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java index 85517a2..b432aa5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemRfid.java @@ -43,6 +43,12 @@ @TableField("create_time") private Date createTime; + @TableField("create_user_id") + private Long createUserId; + + @TableField("create_user_dept") + private Long createUserDept; + public SystemRfid(String rfid) { this.rfid = rfid; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index e00f517..bd07588 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -34,10 +34,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; +import java.util.*; import static com.casic.missiles.enums.ApprovalTypeEnum.*; @@ -117,6 +114,15 @@ String prefix = EQUIPMENT_TYPE_NORMAL.equals(approvalForm.getEquipmentType()) ? PrefixCodeEnum.EQUIPMENT_PREFIX : PrefixCodeEnum.EQUIPMENT_SPECIAL_PREFIX; approvalForm.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo)); } + // 1.1 设置证书有效性 + if(ObjectUtil.isEmpty(approvalForm.getCertificateValid())){ + if(ObjectUtil.isNotEmpty(approvalForm.getCheckDate())){ + Calendar cal = Calendar.getInstance(); + cal.setTime(approvalForm.getCheckDate()); + cal.add(Calendar.MONTH,approvalForm.getCheckCycle()); + approvalForm.setCertificateValid(cal.getTime()); + } + } // 2. 设置申请状态：草稿箱 approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT); // 3. 保存扩展表 @@ -275,6 +281,24 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsageStatus()), "usage_status", queryForm.getUsageStatus()); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "certificate_valid", queryForm.getCertificateValidStart()); queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); + + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"manufacture_no",queryForm.getManufactureNo()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()),"director_name",queryForm.getDirectorName()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUseSign()),"use_sign",queryForm.getUseSign()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocation()),"CONCAT(install_location,install_location_ext)",queryForm.getInstallLocation()); + + if(ObjectUtil.isNotEmpty(queryForm.getTaskId())){ + String existSql = String.format("(select id from eqpt_equipment_task_relation where task_id = %d and equipment_id = eqpt_equipment_info.id)",queryForm.getTaskId()); + queryWrapper.exists(existSql); + } + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()),"check_organization",queryForm.getCheckOrganization()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()),"meter_identify",queryForm.getMeterIdentify()); + queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()),"check_date",queryForm.getCheckDateStart()); + queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()),"check_date",queryForm.getCheckDateEnd()); + + return queryWrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index fa01eb3..6d710c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -332,7 +332,7 @@ this.saveBatch(equipmentInfos); } if (CollUtil.isNotEmpty(technicalTargets)) { - technicalTargetService.saveBatch(technicalTargets); + //technicalTargetService.saveBatch(technicalTargets); } for (EquipmentInfo equipmentInfo : equipmentInfos) { turnoverLogService.saveLog(equipmentInfo, null, user.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java index 60c9684..1c9d830 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java @@ -89,10 +89,10 @@ @Override public Page listScopePage(Page page, EquipmentModelQueryForm queryForm) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("create_dept_id"); +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// dataScope.setScopeName("create_dept_id"); QueryWrapper queryWrapper = commonQuery(queryForm); - List list = this.baseMapper.listScopePage(dataScope,page,queryWrapper); + List list = this.baseMapper.listScopePage(null,page,queryWrapper); List technicalTargetList = technicalTargetService.listByModelIds(list.stream().map(EquipmentModelInfo::getId).collect(Collectors.toList())); for (EquipmentModelInfo equipmentModelInfo : list) { try { @@ -110,10 +110,10 @@ @Override public List listScope(EquipmentModelQueryForm queryForm) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("create_dept_id"); +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// dataScope.setScopeName("create_dept_id"); QueryWrapper queryWrapper = commonQuery(queryForm); - List list = this.baseMapper.listScope(dataScope,queryWrapper); + List list = this.baseMapper.listScope(null,queryWrapper); List technicalTargetList = technicalTargetService.listByModelIds(list.stream().map(EquipmentModelInfo::getId).collect(Collectors.toList())); for (EquipmentModelInfo equipmentModelInfo : list) { try { @@ -143,11 +143,11 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("distinct equipment_name as equipment_name"); - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - List dataScopeDeptIds = dataScope.getDeptIds(); - queryWrapper.in("create_dept_id",dataScopeDeptIds); - } +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// List dataScopeDeptIds = dataScope.getDeptIds(); +// queryWrapper.in("create_dept_id",dataScopeDeptIds); +// } List> maps = this.listMaps(queryWrapper); return maps.stream().map(i->i.get("equipment_name").toString()).collect(Collectors.toList()); } @@ -156,11 +156,11 @@ public List listModel(String equipmentName) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("equipment_name",equipmentName); - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - List dataScopeDeptIds = dataScope.getDeptIds(); - queryWrapper.in("create_dept_id",dataScopeDeptIds); - } +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// List dataScopeDeptIds = dataScope.getDeptIds(); +// queryWrapper.in("create_dept_id",dataScopeDeptIds); +// } queryWrapper.select("distinct model as model"); List> maps = this.listMaps(queryWrapper); return maps.stream().map(i->i.get("model").toString()).collect(Collectors.toList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentTaskInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentTaskInfoServiceImpl.java index 0948c63..a28ffb6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentTaskInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentTaskInfoServiceImpl.java @@ -77,9 +77,8 @@ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getTaskName()), "task_name", queryForm.getTaskName()); if (StrUtil.isNotEmpty(queryForm.getStartTime()) || StrUtil.isNotEmpty(queryForm.getEndTime())) { queryWrapper.and(i -> { - i.le(StrUtil.isNotEmpty(queryForm.getStartTime()), "start_time", queryForm.getStartTime()) - .or() - .ge(StrUtil.isNotEmpty(queryForm.getEndTime()), "end_time", queryForm.getEndTime()); + i.le(StrUtil.isNotEmpty(queryForm.getStartTime()), "start_time", queryForm.getEndTime()) + .ge(StrUtil.isNotEmpty(queryForm.getEndTime()), "end_time", queryForm.getStartTime()); }); } return queryWrapper; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml index ceea930..9ffb414 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml @@ -16,11 +16,12 @@