From 89e84ede3822532abafeccad9c3049f31922ce3f Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 6 Jan 2023 09:36:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BF=90=E7=BB=B4=E5=92=8C?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=B5=8B=E7=BC=96=E5=8F=B7=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/dto/EquipVerificationDTO.java | 4 + .../org/springblade/lims/entry/Simple.java | 4 + .../EquipVerificationController.java | 17 ++- .../file/mapper/EquipVerificationMapper.xml | 3 + .../service/IEquipVerificationLogService.java | 3 + .../impl/EquipVerificationLogServiceImpl.java | 71 +++++++++++- .../impl/EquipVerificationServiceImpl.java | 3 - .../lims/controller/EntrustController.java | 105 ++++++++++++++---- .../lims/controller/ExamineController.java | 8 ++ .../lims/controller/SimpleController.java | 1 + .../lims/service/IExamineService.java | 3 + .../lims/service/ISimpleService.java | 1 + .../lims/service/impl/EntrustServiceImpl.java | 5 +- .../lims/service/impl/ExamineServiceImpl.java | 78 +++++++++++-- .../lims/service/impl/SimpleServiceImpl.java | 14 +-- .../user/service/impl/TrainServiceImpl.java | 37 +++--- .../service/impl/TrainYearServiceImpl.java | 26 ++--- 17 files changed, 301 insertions(+), 82 deletions(-) diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/EquipVerificationDTO.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/EquipVerificationDTO.java index faf9837..e9d8064 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/EquipVerificationDTO.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/EquipVerificationDTO.java @@ -20,6 +20,8 @@ import org.springblade.file.entity.EquipVerification; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 仪器检定管理数据传输对象实体类 * @@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode; public class EquipVerificationDTO extends EquipVerification { private static final long serialVersionUID = 1L; + private List verificationList; + } diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Simple.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Simple.java index 19c6c78..885d1c1 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Simple.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Simple.java @@ -83,5 +83,9 @@ public class Simple extends BaseEntity implements Serializable { // 样品集合 @TableField(exist = false) private List simples; + + // 检测编号前缀 + @TableField(exist = false) + private String prefix; } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java index 5302555..ba0668e 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java @@ -17,6 +17,7 @@ package org.springblade.file.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -28,6 +29,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.file.dto.EquipVerificationDTO; import org.springblade.file.entity.EquipVerification; import org.springblade.file.entity.EquipVerificationLog; import org.springblade.file.service.IEquipVerificationLogService; @@ -97,7 +99,7 @@ public class EquipVerificationController extends BladeController { IPage pages = equipVerificationService.selectEquipVerificationPage(Condition.getPage(query), equipVerification); //获取分页中的具体数据 List records = pages.getRecords(); - //通过计算确定分页中每件设备是否该检定 + //通过计算确定分页中每件设备是否应该检定 equipVerificationService.setVerificationState(records); pages.setRecords(records); return R.data(pages); @@ -115,6 +117,19 @@ public class EquipVerificationController extends BladeController { return R.success("检定成功"); } + /** + * 批量检定 + */ + @PostMapping("/batchVerification") + public R batchVerification(@RequestBody EquipVerificationDTO e) { + List verifications = e.getVerificationList(); + if (CollectionUtils.isNotEmpty(verifications)) { + equipVerificationLogService.batchVerification(verifications); + } + return R.success("检定成功"); + } + + /** * 修改检定记录 * @param e (EquipVerificationLog) diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml index fe4cfbc..909e859 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml +++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml @@ -28,6 +28,9 @@ AND status = #{equipVerification.status,jdbcType=VARCHAR} + + AND instrument_id = #{equipVerification.instrumentId,jdbcType=VARCHAR} + AND equip_name like CONCAT('%', #{equipVerification.equipName,jdbcType=VARCHAR},'%') diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java index 217f19a..3e4a72f 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java @@ -22,6 +22,8 @@ import org.springblade.file.entity.EquipVerification; import org.springblade.file.entity.EquipVerificationLog; import org.springblade.file.vo.EquipVerificationVO; +import java.util.List; + /** * 仪器检定管理 服务类 * @@ -32,4 +34,5 @@ public interface IEquipVerificationLogService extends BaseService verifications); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java index f1a492d..4879090 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java @@ -22,6 +22,7 @@ import org.springblade.file.entity.EquipVerificationLog; import org.springblade.file.mapper.EquipVerificationLogMapper; import org.springblade.file.mapper.EquipVerificationMapper; import org.springblade.file.service.IEquipVerificationLogService; +import org.springblade.file.service.IEquipVerificationService; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.List; /** * 仪器检定管理 服务实现类 @@ -46,14 +49,17 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl 0){ + if (insert > 0) { //更新EquipVerification e.setTotal(e.getTotal() + 1); //检定日期设定为当前轮次的最后一天 LocalDate verificationDay; - if((between % e.getCycle()) > 0){ + if ((between % e.getCycle()) > 0) { verificationDay = enableDate.plusDays(((between / e.getCycle()) + 1) * e.getCycle()); - }else{ + } else { verificationDay = enableDate.plusDays(((between / e.getCycle())) * e.getCycle()); } e.setStatus(1); - e.setLastVerificationTime(verificationDay.atTime(0, 0,0)); + e.setLastVerificationTime(verificationDay.atTime(0, 0, 0)); equipVerificationMapper.updateById(e); } } + + @Override + @Transactional(rollbackFor = Exception.class) + public void batchVerification(List verifications) { + // 检定记录集合 + List verificationLogs = new ArrayList<>(); + + // 遍历每条检定规则生成对应记录，并修改检定规则相关数据 + for (EquipVerification e : verifications) { + EquipVerificationLog log = new EquipVerificationLog(); + log.setCode(e.getCode()); + log.setEquipName(e.getEquipName()); + log.setCycle(e.getCycle()); + log.setEquipStatus(e.getEquipStatus()); + log.setVerificationInfo(e.getVerificationInfo()); + log.setCycle(e.getCycle()); + log.setEnableTime(e.getEnableTime()); + log.setEquipModel(e.getEquipModel()); + log.setInstrumentId(e.getInstrumentId()); + log.setTenantId(e.getTenantId()); + log.setVerificationTime(e.getVerificationTime()); + log.setVerificationMechanism(e.getVerificationMechanism()); + log.setManufacturerOrBrand(e.getManufacturerOrBrand()); + log.setSaveById(e.getSaveById()); + String name = userClient.userInfoById(e.getSaveById()).getData().getName(); + log.setSaveByName(name); + //当前日期 + LocalDate localDate = LocalDate.now(); + LocalDateTime enableTime = e.getEnableTime(); + //设备启用日期 + LocalDate enableDate = LocalDate.of(enableTime.getYear(), enableTime.getMonthValue(), enableTime.getDayOfMonth()); + long between = ChronoUnit.DAYS.between(enableDate, localDate); + log.setCicleNum(between % e.getCycle() == 0 ? Integer.valueOf(String.valueOf(between / e.getCycle())) : Integer.valueOf(String.valueOf(between / e.getCycle() + 1))); +// int insert = equipVerificationLogMapper.insert(log); + verificationLogs.add(log); + + //保存成功后 + //更新EquipVerification + e.setTotal(e.getTotal() + 1); + //检定日期设定为当前轮次的最后一天 + LocalDate verificationDay; + if ((between % e.getCycle()) > 0) { + verificationDay = enableDate.plusDays(((between / e.getCycle()) + 1) * e.getCycle()); + } else { + verificationDay = enableDate.plusDays(((between / e.getCycle())) * e.getCycle()); + } + e.setStatus(1); + e.setLastVerificationTime(verificationDay.atTime(0, 0, 0)); +// equipVerificationMapper.updateById(e); + } + this.saveBatch(verificationLogs); + equipVerificationService.updateBatchById(verifications); + } } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationServiceImpl.java index ca48555..9b44c99 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationServiceImpl.java @@ -55,9 +55,6 @@ public class EquipVerificationServiceImpl extends BaseServiceImpl selectEquipVerificationPage(IPage page, EquipVerificationVO equipVerification) { List list = baseMapper.selectEquipVerificationPage(page, equipVerification); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index 369320a..c431c11 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -1337,29 +1337,81 @@ public class EntrustController extends BladeController { */ @GetMapping("/QrcodeUtils") public void QrcodeUtils(String content, HttpServletResponse response) throws Exception { - BufferedImage img = QrcodeUtils.generateQRCodeImage(content, 400, ClassLoader.getSystemResourceAsStream("logo.png")); - Map result = new HashMap<>(); - - ImageEntity farView = new ImageEntity(); - farView.setHeight(400);//设置高度 - farView.setWidth(400);//设置宽度 - farView.setType(ImageEntity.Data);//类型 - - FileInputStream fis = null; - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ImageIO.write(img, "png", bos); - byte[] bytes = bos.toByteArray(); - farView.setData(bytes); - } catch (Exception e) { - e.printStackTrace(); + List> mapList = new ArrayList<>(); + +// String[] ids = content.split(","); +// SimpleDateFormat format = new SimpleDateFormat("yyyy.MM"); +// for (String id : ids) { +// Map result = new HashMap<>(); +// Instrument instrument = instrumentService.getById(id); +// result.put("1", instrument.getName()); +// result.put("2", instrument.getModel()); +// result.put("3", instrument.getManufacturerBrand()); +// result.put("4", instrument.getStoragePlace()); +// result.put("5", instrument.getCode()); +// result.put("6", instrument.getSaveByName()); +// result.put("7", "所有检测人员"); +// result.put("8", "孙圣福"); +// result.put("9", format.format(instrument.getPurchaseTime())); +// result.put("10", ""); +// BufferedImage img = QrcodeUtils.generateQRCodeImage(instrument.getCode() + " " + instrument.getName(), 400, ClassLoader.getSystemResourceAsStream("logo.png")); +// ImageEntity farView = new ImageEntity(); +// farView.setHeight(100);//设置高度 +// farView.setWidth(100);//设置宽度 +// farView.setType(ImageEntity.Data);//类型 +// +// FileInputStream fis = null; +// try { +// ByteArrayOutputStream bos = new ByteArrayOutputStream(); +// ImageIO.write(img, "png", bos); +// byte[] bytes = bos.toByteArray(); +// farView.setData(bytes); +// bos.close(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// result.put("11", farView); +// mapList.add(result); +// } + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + for (int i = 0; i < 3; i++) { + Map result = new HashMap<>(); + result.put("1", "" + i); + result.put("2", "" + i); + result.put("3", "" + i); + result.put("4", "" + i); + result.put("5", "" + i); + result.put("6", "" + i); + result.put("7", "" + i); + result.put("8", "" + i); + result.put("9", "" + i); + result.put("10", "" + i); + BufferedImage img = QrcodeUtils.generateQRCodeImage(content + i, 400, ClassLoader.getSystemResourceAsStream("logo.png")); + ImageEntity farView = new ImageEntity(); + farView.setHeight(100);//设置高度 + farView.setWidth(100);//设置宽度 + farView.setType(ImageEntity.Data);//类型 + +// FileInputStream fis = null; + try { + ImageIO.write(img, "png", bos); + byte[] bytes = bos.toByteArray(); + farView.setData(bytes); + bos.close(); + } catch (Exception e) { + e.printStackTrace(); + } + result.put("11", farView); + mapList.add(result); } - result.put("img", farView); + String url = "C://Users//AAA//Desktop//shuojin//dayin//二维码（模板）.docx"; + // String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "imagePrint"); - String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "imagePrint"); XWPFDocument doc = null; + FileOutputStream fos = null; try { - doc = WordExportUtil.exportWord07(url, result); + doc = WordExportUtil.exportWord07(url, mapList); + fos = new FileOutputStream("C://Users//AAA//Desktop//shuojin//dayin//二维码.docx"); String filename = "QRcode.docx"; response.setContentType("application/octet-stream"); @@ -1370,6 +1422,21 @@ public class EntrustController extends BladeController { e.printStackTrace(); } finally { if (null != doc) { +// doc.close(); + try { + doc.write(fos); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (null != fos) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (null != doc) { try { doc.close(); } catch (IOException e) { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java index 5b4e90f..fbb879d 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java @@ -418,4 +418,12 @@ public class ExamineController extends BladeController { examineService.receiveSubmit(examine); } + + /** + * 修改检测编号前缀 + */ + @PostMapping("/batchUpdate") + public R batchUpdate(@RequestBody Simple simple) { + return R.status(examineService.batchUpdate(simple)); + } } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleController.java index 990bac2..52dc1de 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleController.java @@ -101,4 +101,5 @@ public class SimpleController extends BladeController { service.updateBatchById(simple.getSimples()); } } + } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineService.java index de0cf7b..f6ef062 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineService.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineService.java @@ -4,6 +4,7 @@ package org.springblade.lims.service; import org.springblade.core.mp.base.BaseService; import org.springblade.lims.entry.Examine; +import org.springblade.lims.entry.Simple; /** * @@ -16,4 +17,6 @@ public interface IExamineService extends BaseService { void updateSimpleCurrPlace(Long taskId, Long deptId, int operateType); void receiveSubmit(Examine examine) throws Exception; + + boolean batchUpdate(Simple simple); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/ISimpleService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/ISimpleService.java index 33d809b..5c39cba 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/ISimpleService.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/ISimpleService.java @@ -18,4 +18,5 @@ import java.util.List; public interface ISimpleService extends BaseService { R saveSimples(SimpleAo simpleAo); + } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 6c3d519..1780d70 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -270,7 +270,7 @@ public class EntrustServiceImpl extends BaseServiceImpl String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "handleUrl"); //模板地址 -// String handleUrl = "C://Users//AAA//Desktop//烁今//打印模板//委托单（模板）.docx"; +// String url = "C://Users//AAA//Desktop//烁今//打印模板//委托单（模板）.docx"; XWPFDocument doc = null; // FileOutputStream fos = null; @@ -3911,7 +3911,7 @@ public class EntrustServiceImpl extends BaseServiceImpl LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Examine::getEntrustId, id); List examineList = examineService.list(wrapper); - if (examineList != null && examineList.size() > 0) { + if (CollectionUtils.isNotEmpty(examineList)) { for (Examine examine : examineList) { Map result = new HashMap<>(); List> resultList = new ArrayList<>(); @@ -4217,7 +4217,6 @@ public class EntrustServiceImpl extends BaseServiceImpl } } - String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "examineReportPrint"); //模板地址 // String handleUrl = "C://Users//AAA//Desktop//烁今//打印模板//留样处理（销毁）申请表（模板）.docx"; diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineServiceImpl.java index 07376ad..e3c6af4 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineServiceImpl.java @@ -10,15 +10,9 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.lims.entry.ContractSample; -import org.springblade.lims.entry.ETask; -import org.springblade.lims.entry.Examine; -import org.springblade.lims.entry.Simple; +import org.springblade.lims.entry.*; import org.springblade.lims.mapper.ExamineMapper; -import org.springblade.lims.service.IContractSampleService; -import org.springblade.lims.service.IETaskService; -import org.springblade.lims.service.IExamineService; -import org.springblade.lims.service.ISimpleService; +import org.springblade.lims.service.*; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; import org.springblade.system.feign.ISysClient; @@ -51,6 +45,8 @@ public class ExamineServiceImpl extends BaseServiceImpl private final ISimpleService simpleService; + private final ISimpleRelService simpleRelService; + @Override @Transactional(rollbackFor = Exception.class) public void updateSimpleCurrPlace(Long taskId, Long deptId, int operateType) { @@ -227,4 +223,70 @@ public class ExamineServiceImpl extends BaseServiceImpl } } } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean batchUpdate(Simple simple) { + // 委托单id + Long entrustId = simple.getEntrustId(); + // 要修改的检测编号前缀 + String prefix = simple.getPrefix(); + + // 修改样品集表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SimpleRel::getEntrustId, entrustId); + List simpleRels = simpleRelService.list(wrapper); + if (CollectionUtils.isNotEmpty(simpleRels)) { + for (SimpleRel simpleRel : simpleRels) { + // 修改你留样样品检测编号 + String reagentExperieNum = simpleRel.getReagentExperieNum(); + simpleRel.setReagentExperieNum(updatePrefix(reagentExperieNum, prefix)); + // 修改实验样品检测编号 + String examineExperieNum = simpleRel.getExamineExperieNum(); + simpleRel.setExamineExperieNum(updatePrefix(examineExperieNum, prefix)); + } + simpleRelService.updateBatchById(simpleRels); + } + + // 修改样品表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Simple::getEntrustId, entrustId); + List simples = simpleService.list(queryWrapper); + if (CollectionUtils.isNotEmpty(simples)) { + for (Simple simple1 : simples) { + String experieNum = simple1.getExperieNum(); + String[] split = experieNum.split("-"); + simple1.setExperieNum(prefix + "-" + split[split.length - 1]); + } + simpleService.updateBatchById(simples); + } + + // 修改检验表 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(Examine::getEntrustId, entrustId); + List examines = this.list(qw); + if (CollectionUtils.isNotEmpty(examines)) { + for (Examine examine : examines) { + String experieNum = examine.getExperieNum(); + examine.setExperieNum(updatePrefix(experieNum, prefix)); + } + } + return this.updateBatchById(examines); + } + + // 修改检测编号前缀 + private String updatePrefix(String experieNum, String prefix) { + String newNum = ""; + String[] nums = experieNum.split(","); + for (int i = 0; i < nums.length; i++) { + String[] split = nums[i].split("-"); + experieNum = prefix + "-" + split[split.length - 1]; + if (i == nums.length - 1) { + newNum += experieNum; + } else { + newNum += experieNum + ","; + } + } + return newNum; + } } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/SimpleServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/SimpleServiceImpl.java index 6ffe552..373a483 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/SimpleServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/SimpleServiceImpl.java @@ -1,5 +1,6 @@ package org.springblade.lims.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -7,16 +8,10 @@ import org.checkerframework.checker.units.qual.A; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.lims.ao.SimpleAo; -import org.springblade.lims.entry.Entrust; -import org.springblade.lims.entry.Simple; -import org.springblade.lims.entry.SimpleRel; -import org.springblade.lims.entry.SimpleSet; +import org.springblade.lims.entry.*; import org.springblade.lims.mapper.EntrustMapper; import org.springblade.lims.mapper.SimpleMapper; -import org.springblade.lims.service.IEntrtrustService; -import org.springblade.lims.service.ISimpleRelService; -import org.springblade.lims.service.ISimpleService; -import org.springblade.lims.service.ISimpleSetService; +import org.springblade.lims.service.*; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +19,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.swing.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -46,8 +42,6 @@ public class SimpleServiceImpl extends BaseServiceImpl imp private final ISimpleSetService simpleSetService; - private final IMessageClient messageClient; - @Override @Transactional(rollbackFor = Exception.class) public R saveSimples(SimpleAo simpleAo) { diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainServiceImpl.java index ef49308..ddcca26 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainServiceImpl.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainServiceImpl.java @@ -73,6 +73,7 @@ public class TrainServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public boolean saveTrain(Train train) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 参训人员 int a1 = 0; if (StringUtils.isNotBlank(train.getTrainPerson())) { @@ -95,7 +96,7 @@ public class TrainServiceImpl extends BaseServiceImpl implem trainPerson.setIsEvaluate(0); personList.add(trainPerson); messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有新的培训会议待参加,请及时查看详情", 1, 5, s, "/train/project"); + "您有新的培训会议待参加,开始时间：" + format.format(train.getStartTime()) + ",请及时查看详情", 1, 5, s, "/train/project"); } trainPersonService.saveBatch(personList); } @@ -116,8 +117,8 @@ public class TrainServiceImpl extends BaseServiceImpl implem trainSpeak.setTel(teacher.getTel()); trainSpeak.setStatus(0); speakList.add(trainSpeak); - messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有新的培训会议待参加,请及时查看详情", 1, 5, train.getTeacher().toString(), "/train/project"); +// messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", +// "您有新的培训会议待参加,开始时间：" + format.format(train.getStartTime()) + ",请及时查看详情", 1, 5, train.getTeacher().toString(), "/train/project"); } trainSpeakService.saveBatch(speakList); } @@ -184,6 +185,7 @@ public class TrainServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public boolean updateTrain(Train train) throws Exception { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 删除参训人员记录 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TrainPerson::getTrainId, train.getId()); @@ -215,7 +217,7 @@ public class TrainServiceImpl extends BaseServiceImpl implem trainPerson.setIsEvaluate(0); personList.add(trainPerson); messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有新的培训会议待参加,请及时查看详情", 1, 5, s, "/train/project"); + "您有新的培训会议待参加,开始时间：" + format.format(train.getStartTime()) + ",请及时查看详情", 1, 5, s, "/train/project"); } trainPersonService.saveBatch(personList); } @@ -237,8 +239,8 @@ public class TrainServiceImpl extends BaseServiceImpl implem trainSpeak.setTel(teacher.getTel()); trainSpeak.setStatus(0); speakList.add(trainSpeak); - messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有新的培训会议待参加,请及时查看详情", 1, 5, train.getTeacher().toString(), "/train/project"); +// messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", +// "您有新的培训会议待参加,开始时间：" + format.format(train.getStartTime()) + ",请及时查看详情", 1, 5, train.getTeacher().toString(), "/train/project"); } trainSpeakService.saveBatch(speakList); } @@ -325,19 +327,20 @@ public class TrainServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public void messageNotice(Train train) { - Train byId = this.getById(train.getId()); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// Train byId = this.getById(train.getId()); // 通知主讲人 - messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有培训会议待参加,请及时查看详情", 1, 5, byId.getTeacher().toString(), "/train/project"); +// messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", +// "您有培训会议待参加,请及时查看详情", 1, 5, byId.getTeacher().toString(), "/train/project"); // 通知参训人员 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(TrainPerson::getTrainId, byId.getId()); + wrapper.eq(TrainPerson::getTrainId, train.getId()); List personList = trainPersonService.list(wrapper); - if (personList != null && personList.size() > 0) { + if (CollectionUtils.isNotEmpty(personList)) { for (TrainPerson trainPerson : personList) { messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议", - "您有培训会议待参加,请及时查看详情", 1, 5, trainPerson.getPersonId().toString(), "/train/project"); + "您有新的培训会议待参加,开始时间：" + format.format(train.getStartTime()) + ",请及时查看详情", 1, 5, trainPerson.getPersonId().toString(), "/train/project"); } } } @@ -357,7 +360,7 @@ public class TrainServiceImpl extends BaseServiceImpl implem LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Teacher::getTeacherId, byId.getTeacher()); Teacher teacher = teacherService.getOne(queryWrapper); - Integer praise = teacher.getPraise(); +// Integer praise = teacher.getPraise(); // teacher.setPraise(praise + train.getEvaluateScore()); teacherService.updateById(teacher); } @@ -391,16 +394,12 @@ public class TrainServiceImpl extends BaseServiceImpl implem result.put("6", train.getPlace()); result.put("7", train.getTrainTarget()); // 考核方式 - result.put("8", DictBizCache.getValue(DictBizEnum.ASSESSMENT_METHOD.getName(), train.getAssessmentMethod())); +// result.put("8", DictBizCache.getValue(DictBizEnum.ASSESSMENT_METHOD.getName(), train.getAssessmentMethod())); + result.put("8", train.getAssessmentMethod()); // 培训主体内容 result.put("9", train.getContentSubject()); // 培训有效性评价 result.put("10", train.getTrainEvaluate()); - -// result.put("11", train.getRecordName()); -// result.put("12", format.format(train.getRecordTime())); -// result.put("13", train.getEvaluateName()); -// result.put("14", format.format(train.getEvaluateTime())); } String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "trainUserLog"); diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainYearServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainYearServiceImpl.java index 0ef1cc0..e100980 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainYearServiceImpl.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainYearServiceImpl.java @@ -54,19 +54,19 @@ public class TrainYearServiceImpl extends BaseServiceImpl 0) { - for (int i = 0; i < count; i++) { - Map map = new HashMap<>(); - map.put("xuhao", trains.size() + i + 1); - map.put("time", ""); - map.put("content", ""); - map.put("trainTarget", ""); - map.put("trainDept", ""); - map.put("remark", ""); - resultList.add(map); - } - } +// int count = 15 - trains.size(); +// if (count > 0) { +// for (int i = 0; i < count; i++) { +// Map map = new HashMap<>(); +// map.put("xuhao", trains.size() + i + 1); +// map.put("time", ""); +// map.put("content", ""); +// map.put("trainTarget", ""); +// map.put("trainDept", ""); +// map.put("remark", ""); +// resultList.add(map); +// } +// } } result.put("list", resultList); String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "trainYear");