1.修改运维和培训模块相关

2.修改检测编号前缀

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<EquipVerification> verificationList;
+
 }

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<Simple> simples;
+
+    // 检测编号前缀
+    @TableField(exist = false)
+    private String prefix;
 }
 

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<EquipVerificationVO> pages = equipVerificationService.selectEquipVerificationPage(Condition.getPage(query), equipVerification);
         //获取分页中的具体数据
         List<EquipVerificationVO> 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<EquipVerification> verifications = e.getVerificationList();
+        if (CollectionUtils.isNotEmpty(verifications)) {
+            equipVerificationLogService.batchVerification(verifications);
+        }
+        return R.success("检定成功");
+    }
+
+
     /**
      * 修改检定记录
      * @param e (EquipVerificationLog)

lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml

@@ -28,6 +28,9 @@
             <if test="equipVerification.status != null and equipVerification.status != ''">
                 AND status = #{equipVerification.status,jdbcType=VARCHAR}
             </if>
+            <if test="equipVerification.instrumentId != null and equipVerification.instrumentId != ''">
+                AND instrument_id = #{equipVerification.instrumentId,jdbcType=VARCHAR}
+            </if>
             <if test="equipVerification.equipName != null and equipVerification.equipName != ''">
                 AND equip_name like CONCAT('%', #{equipVerification.equipName,jdbcType=VARCHAR},'%')
             </if>

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<EquipVerificat
 
     void insertLog(EquipVerification e);
 
+    void batchVerification(List<EquipVerification> verifications);
 }

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,6 +49,9 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
     @Autowired
     private EquipVerificationMapper equipVerificationMapper;
 
+    @Autowired
+    private IEquipVerificationService equipVerificationService;
+
     @Autowired
     private IUserClient userClient;
 
@@ -53,7 +59,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
     @Transactional(rollbackFor = Exception.class)
     public void insertLog(EquipVerification e) {
         //当前日期
-        LocalDateTime localDateTime = LocalDateTime.now();
+//        LocalDateTime localDateTime = LocalDateTime.now();
 
         EquipVerificationLog log = new EquipVerificationLog();
         log.setCode(e.getCode());
@@ -97,4 +103,57 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
             equipVerificationMapper.updateById(e);
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchVerification(List<EquipVerification> verifications) {
+        // 检定记录集合
+        List<EquipVerificationLog> 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);
+    }
 }

lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationServiceImpl.java

@@ -55,9 +55,6 @@ public class EquipVerificationServiceImpl extends BaseServiceImpl<EquipVerificat
     @Autowired
     private IUserClient userClient;
 
-    @Autowired
-    private IEquipVerificationLogService equipVerificationLogService;
-
     @Override
     public IPage<EquipVerificationVO> selectEquipVerificationPage(IPage<EquipVerificationVO> page, EquipVerificationVO equipVerification) {
         List<EquipVerificationVO> list = baseMapper.selectEquipVerificationPage(page, equipVerification);

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"));
+        List<Map<String, Object>> mapList = new ArrayList<>();
+
+//        String[] ids = content.split(",");
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy.MM");
+//        for (String id : ids) {
+//            Map<String, Object> 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<String, Object> 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(400);//设置高度
-        farView.setWidth(400);//设置宽度
+            farView.setHeight(100);//设置高度
+            farView.setWidth(100);//设置宽度
             farView.setType(ImageEntity.Data);//类型
 
-        FileInputStream fis = null;
+//            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("img", farView);
+            result.put("11", farView);
+            mapList.add(result);
+        }
+        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) {

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));
+    }
 }

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());
         }
     }
+
 }

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<Examine> {
     void updateSimpleCurrPlace(Long taskId, Long deptId, int operateType);
 
     void receiveSubmit(Examine examine) throws Exception;
+
+    boolean batchUpdate(Simple simple);
 }

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<Simple> {
 
     R saveSimples(SimpleAo simpleAo);
+
 }

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

@@ -270,7 +270,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         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<EntrustMapper, Entrust>
         LambdaQueryWrapper<Examine> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Examine::getEntrustId, id);
         List<Examine> examineList = examineService.list(wrapper);
-        if (examineList != null && examineList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(examineList)) {
             for (Examine examine : examineList) {
                 Map<String, Object> result = new HashMap<>();
                 List<Map<String, Object>> resultList = new ArrayList<>();
@@ -4217,7 +4217,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             }
         }
 
-
         String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "examineReportPrint");
         //模板地址
 //        String handleUrl = "C://Users//AAA//Desktop//烁今//打印模板//留样处理（销毁）申请表（模板）.docx";

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<ExamineMapper, Examine>
 
     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<ExamineMapper, Examine>
             }
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean batchUpdate(Simple simple) {
+        // 委托单id
+        Long entrustId = simple.getEntrustId();
+        // 要修改的检测编号前缀
+        String prefix = simple.getPrefix();
+
+        // 修改样品集表
+        LambdaQueryWrapper<SimpleRel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SimpleRel::getEntrustId, entrustId);
+        List<SimpleRel> 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<Simple> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Simple::getEntrustId, entrustId);
+        List<Simple> 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<Examine> qw = new LambdaQueryWrapper<>();
+        qw.eq(Examine::getEntrustId, entrustId);
+        List<Examine> 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;
+    }
 }

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<SimpleMapper, Simple> imp
 
     private final ISimpleSetService simpleSetService;
 
-    private final IMessageClient messageClient;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R saveSimples(SimpleAo simpleAo) {

lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainServiceImpl.java

@@ -73,6 +73,7 @@ public class TrainServiceImpl extends BaseServiceImpl<TrainMapper, Train> 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<TrainMapper, Train> 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<TrainMapper, Train> 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<TrainMapper, Train> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateTrain(Train train) throws Exception {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 删除参训人员记录
         LambdaQueryWrapper<TrainPerson> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TrainPerson::getTrainId, train.getId());
@@ -215,7 +217,7 @@ public class TrainServiceImpl extends BaseServiceImpl<TrainMapper, Train> 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<TrainMapper, Train> 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<TrainMapper, Train> 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<TrainPerson> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TrainPerson::getTrainId, byId.getId());
+        wrapper.eq(TrainPerson::getTrainId, train.getId());
         List<TrainPerson> 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<TrainMapper, Train> implem
             LambdaQueryWrapper<Teacher> 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<TrainMapper, Train> 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");

lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/TrainYearServiceImpl.java

@@ -54,19 +54,19 @@ public class TrainYearServiceImpl extends BaseServiceImpl<TrainYearMapper, Train
                 map.put("remark", train.getRemark());
                 resultList.add(map);
             }
-            int count = 15 - trains.size();
-            if (count > 0) {
-                for (int i = 0; i < count; i++) {
-                    Map<String, Object> 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<String, Object> 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");