修改培训管理相关接口

lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java

@@ -120,9 +120,15 @@ public class EquipVerification extends BaseEntity {
     private Integer warnBefore;
 
     /**
-     * 检定人
+     * 检定机构
      */
-    @ApiModelProperty(value = "检定人")
+    @ApiModelProperty(value = "检定机构")
     @TableField(exist = false)
-    private long verificationUser;
+    private String verificationMechanism;
+
+    // 保管人id
+    private Long saveById;
+
+    // 保管人姓名
+    private String saveByName;
 }

lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java

@@ -85,10 +85,10 @@ public class EquipVerificationLog extends BaseEntity {
     @ApiModelProperty(value = "检定周期（天）（业务字典 equip_verification_cycle）")
     private Integer cycle;
     /**
-     * 检定人
+     * 检定机构
      */
-    @ApiModelProperty(value = "检定人")
-    private long verificationUser;
+    @ApiModelProperty(value = "检定机构")
+    private String verificationMechanism;
 
     @ApiModelProperty(value = "检定轮数")
     private Integer cicleNum;
@@ -105,8 +105,10 @@ public class EquipVerificationLog extends BaseEntity {
      * 检定情况
      */
     private String verificationInfo;
-    /**
-     * 检定人姓名
-     */
-    private String verificationUserName;
+
+    // 保管人id
+    private Long saveById;
+
+    // 保管人姓名
+    private String saveByName;
 }

lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/EquipVerificationVO.java

@@ -43,7 +43,7 @@ public class EquipVerificationVO extends EquipVerification {
     /**
      * 检定周期（天）
      */
-    @ApiModelProperty(value = "检定周期（天）（业务字典 equip_verification_cycle）")
+    @ApiModelProperty(value = "检定周期（年）（业务字典 equip_verification_cycle）")
     @JsonSerialize(using = ToStringSerializer.class)
     private Integer cycle;
 //

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LSReservedSample.java

@@ -1,17 +0,0 @@
-package org.springblade.lims.entry;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
-
-import java.io.Serializable;
-
-/**
- * @author swj
- */
-@Data
-@SuppressWarnings("all")
-@TableName("ls_reserved_sample")
-public class LSReservedSample extends BaseEntity implements Serializable {
-
-}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsAuditTrailLog.java

@@ -0,0 +1,24 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_audit_trail_log")
+public class LsAuditTrailLog extends BaseEntity implements Serializable {
+
+    private String xh;
+    private String sjxmmc;
+    private Date sjtjsj;
+    private String sjjg;
+    private String sjry;
+    private Date sjsj;
+    private String bz;
+}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsDataStatistic.java

@@ -0,0 +1,23 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_data_statistic")
+public class LsDataStatistic extends BaseEntity implements Serializable {
+
+    private String xh;
+    private String sjlb;
+    private String ycjbjxx;
+    private Date sj;
+    private String jcmc;
+    private String bz;
+}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsEventLog.java

@@ -0,0 +1,23 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_event_log")
+public class LsEventLog extends BaseEntity implements Serializable {
+
+    private String xh;
+    private String sjmc;
+    private String jcmc;
+    private String ycsjms;
+    private Date sjsj;
+    private String bz;
+}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsReservedSample.java

@@ -0,0 +1,26 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_reserved_sample")
+public class LsReservedSample extends BaseEntity implements Serializable {
+
+
+    private String xh;
+    private String ypxh;
+    private String ypmc;
+    private String lx;
+    private String khmc;
+    private Date lysj;
+    private String lyr;
+    private String bz;
+}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsTemperatureHumidityLog.java

@@ -0,0 +1,26 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_temperature_humidity_log")
+public class LsTemperatureHumidityLog extends BaseEntity implements Serializable {
+
+
+    private String xh;
+    private String wz;
+    private String wd;
+    private String sd;
+    private String gzd;
+    private String jcr;
+    private Date jdrq;
+    private String bz;
+}

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/LsTemplateLog.java

@@ -0,0 +1,24 @@
+package org.springblade.lims.entry;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@SuppressWarnings("all")
+@TableName("ls_template_log")
+public class LsTemplateLog extends BaseEntity implements Serializable {
+
+    private String xh;
+    private String mbmc;
+    private String lb;
+    private Date mbjlrq;
+    private String jlr;
+    private String zt;
+    private String bz;
+}

lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java

@@ -35,6 +35,7 @@ import org.springblade.file.service.IEquipVerificationService;
 import org.springblade.file.vo.EquipVerificationVO;
 import org.springblade.file.wrapper.EquipVerificationWrapper;
 import org.springblade.lims.feign.ILimsClient;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -54,10 +55,13 @@ import java.util.List;
 public class EquipVerificationController extends BladeController {
 
     private final IEquipVerificationService equipVerificationService;
+
     private final IEquipVerificationLogService equipVerificationLogService;
 
     private final ILimsClient limsClient;
 
+    private final IUserClient userClient;
+
     /**
      * 详情
      */
@@ -135,11 +139,15 @@ public class EquipVerificationController extends BladeController {
     @ApiOperation(value = "新增或修改", notes = "传入equipVerification")
     public R submit(@Valid @RequestBody EquipVerification equipVerification) {
         limsClient.updateStatus(equipVerification.getInstrumentId());
+        if (equipVerification.getSaveById() != null) {
+            String name = userClient.userInfoById(equipVerification.getSaveById()).getData().getName();
+            equipVerification.setSaveByName(name);
+        }
         return R.status(equipVerificationService.saveOrUpdate(equipVerification));
     }
 
     /**
-     * 新增或修改 仪器检定管理
+     * 删除 仪器检定管理
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 6)

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

@@ -67,11 +67,11 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
         log.setInstrumentId(e.getInstrumentId());
         log.setTenantId(e.getTenantId());
         log.setVerificationTime(e.getVerificationTime());
-        log.setVerificationUser(e.getVerificationUser());
-        User userR = userClient.userInfoById(e.getVerificationUser()).getData();
-        log.setVerificationUserName(userR.getName());
+        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();

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

@@ -137,7 +137,7 @@ public class EquipVerificationServiceImpl extends BaseServiceImpl<EquipVerificat
 
             if (ChronoUnit.DAYS.between(lastVerificationDay, now) >= 0) { //只有当前日期 > = 上次检定日期
                 long between = ChronoUnit.DAYS.between(lastVerificationDay, now);
-                Integer cycle = e.getCycle();
+                Integer cycle = e.getCycle() * 365;
 
                 if ((between / cycle) >= 1) { //说明超过一轮未检测了
                     e.setStatus(0);

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java

@@ -1,6 +1,7 @@
 
 package org.springblade.lims.controller;
 
+import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -67,6 +68,10 @@ public class InstrumentController extends BladeController {
         if (entry.getStatus() != null) {
             wrapper.eq(Instrument::getStatus, entry.getStatus());
         }
+        // 根据是否需要检定筛选
+        if (StringUtils.isNotBlank(entry.getIsVerification())) {
+            wrapper.eq(Instrument::getIsVerification, entry.getIsVerification());
+        }
         if (entry.getName() != null && !"".equals(entry.getName())) {
             wrapper.and(wq -> wq
                     .like(Instrument::getName, entry.getName()).or()

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java

@@ -137,7 +137,7 @@ public class RepairApplicationController extends BladeController {
             Instrument instrument = new Instrument();
             instrument.setId(repairApplication.getInstrumentId());
             if (repairApplication.getStatus() == 4) {
-                instrument.setInstrumentStatus("0");
+                instrument.setInstrumentStatus("1");
             } else {
                 instrument.setInstrumentStatus("3");
             }
@@ -150,19 +150,19 @@ public class RepairApplicationController extends BladeController {
                 scrapApplication.setCode(application.getCode());
                 scrapApplication.setType(application.getType());
                 scrapApplication.setName(application.getName());
+                scrapApplication.setModel(application.getModel());
                 scrapApplication.setEquipmentId(AuthUtil.getUserId());
                 scrapApplication.setEquipmentName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
                 scrapApplication.setCreateTime(new Date());
-                scrapApplication.setModel(application.getVersion());
                 scrapApplication.setStatus(0);
                 scrapApplication.setReasonAndState(repairApplication.getReasonForScrapping());
                 //维修金额
-                scrapApplication.setMoney(application.getTotalCost() == null ? 0 : application.getTotalCost());
+                scrapApplication.setMoney(repairApplication.getTotalCost() == null ? "0" : repairApplication.getTotalCost().toString());
                 //购置日期
                 Instrument instrumentThis = instrumentService.getById(application.getInstrumentId());
                 scrapApplication.setPurchaseTime(instrumentThis.getPurchaseTime());
                 //处理情况，使用维修单的维修记录
-                scrapApplication.setHandling(application.getMaintenanceRecord() == null ? "" : application.getMaintenanceRecord());
+                scrapApplication.setHandling(repairApplication.getMaintenanceRecord() == null ? "" : repairApplication.getMaintenanceRecord());
                 scrapApplicationService.save(scrapApplication);
             }
         }

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java

@@ -10,19 +10,15 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.lims.entry.Instrument;
-import org.springblade.lims.entry.RepairApplication;
 import org.springblade.lims.entry.ScrapApplication;
 import org.springblade.lims.service.IInstrumentService;
-import org.springblade.lims.service.IRepairApplicationService;
 import org.springblade.lims.service.IScrapApplicationService;
 import org.springblade.resource.enums.SysTypeEnum;
 import org.springblade.resource.feign.IMessageClient;
-import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author swj
@@ -65,6 +61,24 @@ public class ScrapApplicationController extends BladeController {
         return R.data(page);
     }
 
+    /**
+     * 新增
+     */
+    @PostMapping("/save")
+    public R save(@RequestBody ScrapApplication scrapApplication){
+        // 修改设备状态为维修中
+        Instrument instrument = new Instrument();
+        instrument.setId(scrapApplication.getInstrumentId());
+        instrument.setInstrumentStatus("3");
+        instrumentService.updateById(instrument);
+
+        scrapApplication.setEquipmentId(AuthUtil.getUserId());
+        scrapApplication.setEquipmentName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
+        scrapApplication.setStatus(0);
+        scrapApplication.setCreateTime(new Date());
+        return R.status(scrapApplicationService.save(scrapApplication));
+    }
+
     /**
      * 修改
      */

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

@@ -4287,7 +4287,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             result.put("3", repair.getName());
             result.put("4", repair.getCode());
             result.put("5", repair.getManufacturer());
-            result.put("6", repair.getVersion());
+            result.put("6", repair.getModel());
             result.put("7", format.format(repair.getProductionDate()));
             result.put("8", format.format(repair.getEnableDate()));
             result.put("9", repair.getFaultPhenomenon());
@@ -4314,7 +4314,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             String url = DictBizCache.getKey(DictBizEnum.PRINT_URL.getName(), "repairPrint");
             try {
                 doc = WordExportUtil.exportWord07(url, result);
-                fos = new FileOutputStream(srcPathName + "//" + repair.getName() + "报修申请表.docx");
+                fos = new FileOutputStream(srcPathName + "/" + repair.getName() + "报修申请表.docx");
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {

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

@@ -92,6 +92,7 @@ public class TrainServiceImpl extends BaseServiceImpl<TrainMapper, Train> implem
                 trainPerson.setDeptName(deptName);
                 trainPerson.setTel(user.getPhone());
                 trainPerson.setStatus(0);
+                trainPerson.setIsEvaluate(0);
                 personList.add(trainPerson);
                 messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议",
                         "您有新的培训会议待参加,请及时查看详情", 1, 5, s, "/train/project");
@@ -211,6 +212,7 @@ public class TrainServiceImpl extends BaseServiceImpl<TrainMapper, Train> implem
                 trainPerson.setDeptName(deptName);
                 trainPerson.setTel(user.getPhone());
                 trainPerson.setStatus(0);
+                trainPerson.setIsEvaluate(0);
                 personList.add(trainPerson);
                 messageClient.event(SysTypeEnum.INFORM.getValue(), "培训会议",
                         "您有新的培训会议待参加,请及时查看详情", 1, 5, s, "/train/project");