From 3234604e313dd735ac4f4895b7c88c5cb9b508ad Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 26 Aug 2022 23:13:32 +0800 Subject: [PATCH] =?UTF-8?q?2022=E5=B9=B48=E6=9C=8826=E6=97=A523:13:12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/lims/goods/entity/Apply.java | 8 + .../lims/goods/entity/ApplyDetail.java | 3 + .../springblade/lims/goods/entity/Batch.java | 3 + .../lims/goods/entity/Contract.java | 3 + .../lims/goods/entity/ContractDetail.java | 4 + .../springblade/lims/goods/entity/Goods.java | 4 + .../lims/goods/entity/InDetailGoods.java | 3 + .../lims/goods/entity/InGoods.java | 4 + .../org/springblade/lims/entry/Contract.java | 4 + .../springblade/lims/entry/DangerApply.java | 3 + .../lims/entry/DangerApplyLog.java | 4 + .../lims/entry/DetermineFormula.java | 3 + .../org/springblade/lims/entry/ETask.java | 6 + .../org/springblade/lims/entry/Entrust.java | 2 +- .../org/springblade/lims/entry/EnvLog.java | 3 + .../org/springblade/lims/entry/Examine.java | 1 + .../springblade/lims/entry/ExamineItem.java | 5 +- .../springblade/lims/entry/ExamineResult.java | 5 + .../springblade/lims/entry/ExamineWay.java | 11 + .../springblade/lims/entry/Instrument.java | 3 + .../org/springblade/lims/entry/Reagent.java | 3 + .../lims/entry/RepairApplication.java | 11 + .../lims/entry/RetentionSimpleDestroyLog.java | 3 + .../org/springblade/lims/entry/SimpleSet.java | 4 + .../org/springblade/lims/entry/Template.java | 1 - .../goods/controller/ApplyController.java | 41 +- .../lims/controller/EntrustController.java | 611 +++++++++--------- .../controller/EntrustCustomerController.java | 2 +- .../controller/ReagentUseLogController.java | 3 +- .../lims/service/impl/EntrustServiceImpl.java | 8 +- .../impl/ExamineResultServiceImpl.java | 4 +- .../user/controller/TeacherController.java | 8 + .../user/controller/UserController.java | 3 +- 33 files changed, 456 insertions(+), 328 deletions(-) diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java index 153582c..bcecd9d 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java @@ -4,6 +4,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -76,6 +78,7 @@ public class Apply extends BaseEntity implements Serializable { * 第一级审批人 */ @ApiModelProperty(value = "第一级审批人") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long approveUserId; /** * 审批时间 @@ -121,6 +124,7 @@ public class Apply extends BaseEntity implements Serializable { * */ @ApiModelProperty(value = "申领人id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long applyUserId; //是否变更 @@ -131,6 +135,7 @@ public class Apply extends BaseEntity implements Serializable { private List applyDetails; // 应该由那个角色审批 + @JsonSerialize(nullsUsing = NullSerializer.class) private Long approveRoleId; // 出库时间 @@ -138,4 +143,7 @@ public class Apply extends BaseEntity implements Serializable { @TableField(exist = false) private List detailList; + + @TableField(exist = false) + private String isGetAll; } diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java index 51964cd..6872010 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java @@ -4,6 +4,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,6 +48,7 @@ public class ApplyDetail extends BaseEntity { * 物品编号 */ @ApiModelProperty(value = "物品id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long productId; @ApiModelProperty(value = "物品名称") diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Batch.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Batch.java index a677129..2510e38 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Batch.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Batch.java @@ -2,6 +2,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,6 +26,7 @@ public class Batch extends BaseEntity implements Serializable { // 批次 private Integer batch; // 物品id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long goodsId; // 物品名称 private String goodsName; diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Contract.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Contract.java index 39e4acc..873bfd4 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Contract.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Contract.java @@ -2,6 +2,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import com.sun.org.apache.xerces.internal.impl.xpath.XPath; import io.swagger.models.auth.In; import lombok.Data; @@ -24,6 +26,7 @@ public class Contract extends BaseEntity implements Serializable { // private String code; // 供应商id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long supplierId; // 供应商名称 diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java index 9c6339d..6e7e32d 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java @@ -3,6 +3,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; @@ -20,8 +22,10 @@ public class ContractDetail extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; // 合同id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long contractId; // 物品id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long goodsId; // 物品名称 private String goodsName; diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java index 4bc9948..32cb95f 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java @@ -3,6 +3,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +28,7 @@ public class Goods extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "物品大类") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long bigClassId; @ApiModelProperty(value = "物品大类名称") @@ -53,6 +56,7 @@ public class Goods extends BaseEntity { private String company; @ApiModelProperty(value = "物品厂商id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long companyId; @ApiModelProperty(value = "是否固定资产1:固定，2:物品，3：易耗品") diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InDetailGoods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InDetailGoods.java index 8d53e39..8abb433 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InDetailGoods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InDetailGoods.java @@ -2,6 +2,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,6 +35,7 @@ public class InDetailGoods extends BaseEntity { private Long contractId; //入库单id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long orderId; /** * 物品名称 diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InGoods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InGoods.java index 771c16f..e2d10d9 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InGoods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/InGoods.java @@ -3,6 +3,8 @@ package org.springblade.lims.goods.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,12 +39,14 @@ public class InGoods extends BaseEntity { private String inUserName; @ApiModelProperty(value = "经办人") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long inUserId; @ApiModelProperty(value = "入库审核人") private String applyUser; @ApiModelProperty(value = "入库审核人Id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long applyUserId; /** diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Contract.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Contract.java index 16d7b9a..e962b83 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Contract.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Contract.java @@ -1,6 +1,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; @@ -39,6 +41,7 @@ public class Contract extends BaseEntity implements Serializable { private String reviewConclusion; // 评审结论技术负责人id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long reviewConclusionTechnicalDirectorId; // 评审结论技术负责人姓名 @@ -63,6 +66,7 @@ public class Contract extends BaseEntity implements Serializable { private String assessorDept; // 中心主任id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long centerDirectorId; // 中心主任姓名 diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApply.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApply.java index 7c92ddd..d35123d 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApply.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApply.java @@ -1,6 +1,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -28,6 +30,7 @@ public class DangerApply extends BaseEntity implements Serializable { public String unit; + @JsonSerialize(nullsUsing = NullSerializer.class) public Integer count; public String supplier; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApplyLog.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApplyLog.java index 48c2898..f3d81de 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApplyLog.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DangerApplyLog.java @@ -1,6 +1,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -20,6 +22,7 @@ public class DangerApplyLog extends BaseEntity implements Serializable { @Id private Long id; + @JsonSerialize(nullsUsing = NullSerializer.class) private Long deptId; public String name; @@ -30,6 +33,7 @@ public class DangerApplyLog extends BaseEntity implements Serializable { public String unit; + @JsonSerialize(nullsUsing = NullSerializer.class) public Integer count; public String remark; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DetermineFormula.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DetermineFormula.java index 63c6412..b31b7d9 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DetermineFormula.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/DetermineFormula.java @@ -1,6 +1,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -18,6 +20,7 @@ public class DetermineFormula extends BaseEntity implements Serializable { @Id private Long id; + @JsonSerialize(nullsUsing = NullSerializer.class) public Integer type; public String formula; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ETask.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ETask.java index dfb1018..4519359 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ETask.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ETask.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -27,11 +29,13 @@ public class ETask extends BaseEntity implements Serializable { /** * 任务书表id */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long taskBlueprintId; /** * 部门id（科室一、科室二.....） */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long deptId; /** @@ -59,6 +63,7 @@ public class ETask extends BaseEntity implements Serializable { /** * 流转至 */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long flowTo; /** @@ -112,6 +117,7 @@ public class ETask extends BaseEntity implements Serializable { private String isComplete; // 权重 + @JsonSerialize(nullsUsing = NullSerializer.class) private Integer weight; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Entrust.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Entrust.java index bcc00ab..4ae6af8 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Entrust.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Entrust.java @@ -142,7 +142,7 @@ public class Entrust extends BaseEntity implements Serializable { private List examines; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss") + @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("创建时间") private Date createTime; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/EnvLog.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/EnvLog.java index 810d3d8..e55ecd6 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/EnvLog.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/EnvLog.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -25,6 +27,7 @@ public class EnvLog extends BaseEntity implements Serializable { /** * */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long examineItemId; /** diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java index 60f043b..5235999 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java @@ -62,6 +62,7 @@ public class Examine extends BaseEntity implements Serializable { /** * 检测项目表id */ + // 防止后端空值返回前端变成-1 @JsonSerialize(nullsUsing = NullSerializer.class) private Long examineItemId; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java index 56c5a9c..b812204 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java @@ -2,6 +2,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -55,17 +57,18 @@ public class ExamineItem extends BaseEntity implements Serializable { /** * 关联检验方法 */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long examineWayId; /** * 关联检验名称 */ - @TableField(exist = false) private String examineWayName; /** * 关联检验依据 */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long examineBasisId; /** diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java index a9d77a5..39f95bc 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java @@ -2,6 +2,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -27,11 +29,13 @@ public class ExamineResult extends BaseEntity implements Serializable { /** * 批次号 */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Integer batch; /** * examine表id */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long examineId; /** @@ -80,6 +84,7 @@ public class ExamineResult extends BaseEntity implements Serializable { /** * 校核人id */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long verificationUser; /** diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java index 2f571fa..94fc851 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java @@ -26,11 +26,22 @@ public class ExamineWay extends BaseEntity implements Serializable { */ private String name; + /** + * 标准编号 + */ + private String standardCode; + + /** + * 标准类型 + */ + private String standardType; + /** * 主要操作程序 */ private String operation; + private Long instrumentId; /** diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java index c947c0f..60e75b1 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java @@ -2,6 +2,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -32,6 +34,7 @@ public class Instrument extends BaseEntity implements Serializable { public String storagePlace; + @JsonSerialize(nullsUsing = NullSerializer.class) public Long saveById; public String saveByName; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java index 91adbf9..836f151 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java @@ -2,6 +2,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -36,6 +38,7 @@ public class Reagent extends BaseEntity implements Serializable { public String manager; + @JsonSerialize(nullsUsing = NullSerializer.class) public Integer type; public String count; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java index 1b561ab..4426435 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java @@ -2,6 +2,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -40,12 +42,14 @@ public class RepairApplication extends BaseEntity implements Serializable { // 故障现象及用户要求 private String faultPhenomenon; // 申请人 + @JsonSerialize(nullsUsing = NullSerializer.class) private Long applyUser; // 申请人姓名 private String applyUserName; // 确认日期 private Date applyDate; // 部门负责人 + @JsonSerialize(nullsUsing = NullSerializer.class) private Long applyDeptUser; // 部门负责人姓名 private String applyDeptUserName; @@ -54,6 +58,7 @@ public class RepairApplication extends BaseEntity implements Serializable { // 审核时间 private Date reviewDate; // 业务室id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long businessOfficeId; // 业务室姓名 private String businessOfficeName; @@ -62,6 +67,7 @@ public class RepairApplication extends BaseEntity implements Serializable { // 审批时间 private Date approvalDate; // 中心主任id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long centerDirectorId; // 中心主任姓名 private String centerDirectorName; @@ -72,16 +78,21 @@ public class RepairApplication extends BaseEntity implements Serializable { // 维修时间 private Date maintainerDate; // 总工时 + @JsonSerialize(nullsUsing = NullSerializer.class) private Double workingHours; // 人工费 + @JsonSerialize(nullsUsing = NullSerializer.class) private Double laborCost; // 材料费 + @JsonSerialize(nullsUsing = NullSerializer.class) private Double materialCost; // 总计费 + @JsonSerialize(nullsUsing = NullSerializer.class) private Double totalCost; // 用户意见 private String userComments; // 验收人id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long acceptedBy; // 验收人姓名 private String acceptedName; diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RetentionSimpleDestroyLog.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RetentionSimpleDestroyLog.java index 3bff8c9..dc3ae68 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RetentionSimpleDestroyLog.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RetentionSimpleDestroyLog.java @@ -1,6 +1,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -77,6 +79,7 @@ public class RetentionSimpleDestroyLog extends BaseEntity implements Serializabl /** * 技术负责人id */ + @JsonSerialize(nullsUsing = NullSerializer.class) private Long technicalDirectorId; // 处理说明 diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/SimpleSet.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/SimpleSet.java index 649bb13..88e22a4 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/SimpleSet.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/SimpleSet.java @@ -3,6 +3,8 @@ package org.springblade.lims.entry; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; @@ -65,6 +67,7 @@ public class SimpleSet extends BaseEntity implements Serializable { private String retentionPlace; // 领样人id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long sampleReceiverId; // 领样人姓名 @@ -74,6 +77,7 @@ public class SimpleSet extends BaseEntity implements Serializable { private Date sampleReceiverDate; // 还样人id + @JsonSerialize(nullsUsing = NullSerializer.class) private Long sampleReturnId; // 还样人姓名 diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Template.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Template.java index 1d62384..efb84ae 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Template.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Template.java @@ -26,4 +26,3 @@ public class Template extends BaseEntity implements Serializable { //模板内容 private String content; } - diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index 237b224..d01de7c 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -20,6 +20,8 @@ import org.springblade.lims.goods.service.IGoodsService; import org.springblade.lims.goods.vo.ApplyVO; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; +import org.springblade.system.cache.DictBizCache; +import org.springblade.system.enums.DictBizEnum; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.transaction.annotation.Transactional; @@ -55,15 +57,18 @@ public class ApplyController extends BladeController { String temp = apply.getApplyUser(); apply.setApplyUser(null); // 同部门要看 - if (!"kg".equals(AuthUtil.getUserRole())) { + if (!"1".equals(apply.getIsGetAll())) { apply.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(apply); + wrapper.eq(Apply::getStatus, 1).or().eq(Apply::getStatus, 3).or().eq(Apply::getStatus, 4); if (temp != null && !"".equals(temp)) { - wrapper.like(Apply::getApplyUser, temp).or(); - wrapper.like(Apply::getRemark, temp).or(); - wrapper.like(Apply::getApproveUser, temp).or(); - wrapper.like(Apply::getReason, temp); + wrapper.and(qw -> qw + .like(Apply::getApplyUser, temp).or() + .like(Apply::getRemark, temp).or() + .like(Apply::getApproveUser, temp).or() + .like(Apply::getReason, temp) + ); } wrapper.orderByDesc(Apply::getCreateTime); return applyService.page(Condition.getPage(query), wrapper); @@ -73,37 +78,49 @@ public class ApplyController extends BladeController { * 2.申领列表 顶部状态栏数据 */ @GetMapping("/getEveryStatusAndCount") - public Map getEveryStatusAndCount() { + public Map getEveryStatusAndCount(String isGetAll) { Map map = new HashMap<>(6); QueryWrapper queryWrapper = new QueryWrapper<>(); // 驳回 queryWrapper.eq("status", -1); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("bh", applyService.count(queryWrapper)); queryWrapper.clear(); // 待审核 queryWrapper.eq("status", 0); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("dsh", applyService.count(queryWrapper)); queryWrapper.clear(); // 待出库 queryWrapper.eq("status", 1); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("dck", applyService.count(queryWrapper)); queryWrapper.clear(); // 待确定 queryWrapper.eq("status", 2); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("dqd", applyService.count(queryWrapper)); queryWrapper.clear(); // 待归还 queryWrapper.eq("status", 3); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("dgh", applyService.count(queryWrapper)); queryWrapper.clear(); // 申领完成 queryWrapper.eq("status", 4); - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (!"1".equals(isGetAll)) { + queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + } map.put("slwc", applyService.count(queryWrapper)); queryWrapper.clear(); return map; 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 985cd0a..0ce3625 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 @@ -103,309 +103,309 @@ public class EntrustController extends BladeController { // TODO 有空抽代码.... // 如果传部门了 - if (entry != null && entry.getDeptId() != null && !"".equals(entry.getDeptId())) { - // 科室一 - if (entry.getDeptId().equals("1536303217085018114")) { - //组长或校核人 - if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { - query.setDescs("create_time"); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); - if (entry.getEntrustCustomerName() != null) { - wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); - } - IPage iPage = service.page(Condition.getPage(query), wrapper1); - - List entrustList = new ArrayList<>(); - LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); - eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); - List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); - if (eTasks != null && eTasks.size() > 0) { - for (ETask eTask : eTasks) { - if (eTask != null) { - TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); - if (taskBlueprint != null) { - Entrust entrust = service.getById(taskBlueprint.getEntrustId()); - if (entrust != null) { - // 待分配 - if ("000".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - entrustList.add(entrust); - } - } - //检测中 - else if ("111".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - entrustList.add(entrust); - } - } - //待审核 - else if ("3".equals(entry.getEntrustStatus())) { - if ("3".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //通过 - else if ("4".equals(entry.getEntrustStatus())) { - if ("4".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //驳回 - else if ("5".equals(entry.getEntrustStatus())) { - if ("5".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //全部 - else if ("111".equals(entrust.getEntrustStatus()) || - "3".equals(entrust.getEntrustStatus()) || - "2.1".equals(entrust.getEntrustStatus()) || - "4".equals(entrust.getEntrustStatus()) || - "5".equals(entrust.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - } - entrustList.add(entrust); - } - } - } - } - } - } - if (entrustList != null && entrustList.size() > 0) { - for (Entrust entrust : entrustList) { - Integer count = 0; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (entrust != null) { - queryWrapper.eq(Examine::getEntrustId, entrust.getId()); - queryWrapper.eq(Examine::getDeptId, "1536303217085018114"); - List examines = examineService.list(queryWrapper); - if (examines != null && examines.size() > 0) { - for (Examine examine : examines) { - if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { - String experieNum = examine.getExperieNum(); - String[] split = experieNum.split(","); - count += split.length; - } - } - } - entrust.setSimpleCount(count); - } - } - } - iPage.setTotal(entrustList.size()); - List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); - iPage.setRecords(collect); - return R.data(iPage); - } - } - // 科室二 - if (entry.getDeptId().equals("1536303261238456322")) { - //组长或校核人 - if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { - query.setDescs("update_time"); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); - if (entry.getEntrustCustomerName() != null) { - wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); - } - IPage iPage = service.page(Condition.getPage(query), wrapper1); - - List entrustList = new ArrayList<>(); - LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); - eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); - List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); - if (eTasks != null && eTasks.size() > 0) { - for (ETask eTask : eTasks) { - if (eTask != null) { - TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); - if (taskBlueprint != null) { - Entrust entrust = service.getById(taskBlueprint.getEntrustId()); - if (entrust != null) { - // 待分配 - if ("000".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - entrustList.add(entrust); - } - } - //检测中 - else if ("111".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - entrustList.add(entrust); - } - } - //待审核 - else if ("3".equals(entry.getEntrustStatus())) { - if ("3".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //通过 - else if ("4".equals(entry.getEntrustStatus())) { - if ("4".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //驳回 - else if ("5".equals(entry.getEntrustStatus())) { - if ("5".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //全部 - else if ("111".equals(entrust.getEntrustStatus()) || - "3".equals(entrust.getEntrustStatus()) || - "4".equals(entrust.getEntrustStatus()) || - "5".equals(entrust.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - } - entrustList.add(entrust); - } - } - } - } - } - } - if (entrustList != null && entrustList.size() > 0) { - for (Entrust entrust : entrustList) { - Integer count = 0; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (entrust != null) { - queryWrapper.eq(Examine::getEntrustId, entrust.getId()); - queryWrapper.eq(Examine::getDeptId, "1536303261238456322"); - List examines = examineService.list(queryWrapper); - if (examines != null && examines.size() > 0) { - for (Examine examine : examines) { - if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { - String experieNum = examine.getExperieNum(); - String[] split = experieNum.split(","); - count += split.length; - } - } - } - entrust.setSimpleCount(count); - } - } - } - iPage.setTotal(entrustList.size()); - List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); - iPage.setRecords(collect); - return R.data(iPage); - } - } - // 科室三 - if (entry.getDeptId().equals("1536303317815422978")) { - //组长或校核人 - if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { - query.setDescs("update_time"); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); - if (entry.getEntrustCustomerName() != null) { - wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); - wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); - } - IPage iPage = service.page(Condition.getPage(query), wrapper1); - - List entrustList = new ArrayList<>(); - LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); - eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); - List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); - if (eTasks != null && eTasks.size() > 0) { - for (ETask eTask : eTasks) { - if (eTask != null) { - TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); - if (taskBlueprint != null) { - Entrust entrust = service.getById(taskBlueprint.getEntrustId()); - if (entrust != null) { - // 待分配 - if ("000".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - entrustList.add(entrust); - } - } - //检测中 - else if ("111".equals(entry.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - entrustList.add(entrust); - } - } - //待审核 - else if ("3".equals(entry.getEntrustStatus())) { - if ("3".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //通过 - else if ("4".equals(entry.getEntrustStatus())) { - if ("4".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //驳回 - else if ("5".equals(entry.getEntrustStatus())) { - if ("5".equals(entrust.getEntrustStatus())) { - entrustList.add(entrust); - } - } - //全部 - else if ("111".equals(entrust.getEntrustStatus()) || - "3".equals(entrust.getEntrustStatus()) || - "4".equals(entrust.getEntrustStatus()) || - "5".equals(entrust.getEntrustStatus())) { - if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { - entrust.setActualDistrib("0"); - } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { - entrust.setActualDistrib("1"); - } - entrustList.add(entrust); - } - } - } - } - } - } - if (entrustList != null && entrustList.size() > 0) { - for (Entrust entrust : entrustList) { - Integer count = 0; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (entrust != null) { - queryWrapper.eq(Examine::getEntrustId, entrust.getId()); - queryWrapper.eq(Examine::getDeptId, "1536303317815422978"); - List examines = examineService.list(queryWrapper); - if (examines != null && examines.size() > 0) { - for (Examine examine : examines) { - if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { - String experieNum = examine.getExperieNum(); - String[] split = experieNum.split(","); - count += split.length; - } - } - } - entrust.setSimpleCount(count); - } - } - } - iPage.setTotal(entrustList.size()); - List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); - iPage.setRecords(collect); - return R.data(iPage); - } - } - } +// if (entry != null && entry.getDeptId() != null && !"".equals(entry.getDeptId())) { +// // 科室一 +// if (entry.getDeptId().equals("1536303217085018114")) { +// //组长或校核人 +// if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { +// query.setDescs("create_time"); +// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); +// if (entry.getEntrustCustomerName() != null) { +// wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); +// } +// IPage iPage = service.page(Condition.getPage(query), wrapper1); +// +// List entrustList = new ArrayList<>(); +// LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); +// List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); +// if (eTasks != null && eTasks.size() > 0) { +// for (ETask eTask : eTasks) { +// if (eTask != null) { +// TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); +// if (taskBlueprint != null) { +// Entrust entrust = service.getById(taskBlueprint.getEntrustId()); +// if (entrust != null) { +// // 待分配 +// if ("000".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// entrustList.add(entrust); +// } +// } +// //检测中 +// else if ("111".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// entrustList.add(entrust); +// } +// } +// //待审核 +// else if ("3".equals(entry.getEntrustStatus())) { +// if ("3".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //通过 +// else if ("4".equals(entry.getEntrustStatus())) { +// if ("4".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //驳回 +// else if ("5".equals(entry.getEntrustStatus())) { +// if ("5".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //全部 +// else if ("111".equals(entrust.getEntrustStatus()) || +// "3".equals(entrust.getEntrustStatus()) || +// "2.1".equals(entrust.getEntrustStatus()) || +// "4".equals(entrust.getEntrustStatus()) || +// "5".equals(entrust.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// } +// entrustList.add(entrust); +// } +// } +// } +// } +// } +// } +// if (entrustList != null && entrustList.size() > 0) { +// for (Entrust entrust : entrustList) { +// Integer count = 0; +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// if (entrust != null) { +// queryWrapper.eq(Examine::getEntrustId, entrust.getId()); +// queryWrapper.eq(Examine::getDeptId, "1536303217085018114"); +// List examines = examineService.list(queryWrapper); +// if (examines != null && examines.size() > 0) { +// for (Examine examine : examines) { +// if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { +// String experieNum = examine.getExperieNum(); +// String[] split = experieNum.split(","); +// count += split.length; +// } +// } +// } +// entrust.setSimpleCount(count); +// } +// } +// } +// iPage.setTotal(entrustList.size()); +// List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); +// iPage.setRecords(collect); +// return R.data(iPage); +// } +// } +// // 科室二 +// if (entry.getDeptId().equals("1536303261238456322")) { +// //组长或校核人 +// if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { +// query.setDescs("update_time"); +// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); +// if (entry.getEntrustCustomerName() != null) { +// wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); +// } +// IPage iPage = service.page(Condition.getPage(query), wrapper1); +// +// List entrustList = new ArrayList<>(); +// LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); +// List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); +// if (eTasks != null && eTasks.size() > 0) { +// for (ETask eTask : eTasks) { +// if (eTask != null) { +// TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); +// if (taskBlueprint != null) { +// Entrust entrust = service.getById(taskBlueprint.getEntrustId()); +// if (entrust != null) { +// // 待分配 +// if ("000".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// entrustList.add(entrust); +// } +// } +// //检测中 +// else if ("111".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// entrustList.add(entrust); +// } +// } +// //待审核 +// else if ("3".equals(entry.getEntrustStatus())) { +// if ("3".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //通过 +// else if ("4".equals(entry.getEntrustStatus())) { +// if ("4".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //驳回 +// else if ("5".equals(entry.getEntrustStatus())) { +// if ("5".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //全部 +// else if ("111".equals(entrust.getEntrustStatus()) || +// "3".equals(entrust.getEntrustStatus()) || +// "4".equals(entrust.getEntrustStatus()) || +// "5".equals(entrust.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// } +// entrustList.add(entrust); +// } +// } +// } +// } +// } +// } +// if (entrustList != null && entrustList.size() > 0) { +// for (Entrust entrust : entrustList) { +// Integer count = 0; +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// if (entrust != null) { +// queryWrapper.eq(Examine::getEntrustId, entrust.getId()); +// queryWrapper.eq(Examine::getDeptId, "1536303261238456322"); +// List examines = examineService.list(queryWrapper); +// if (examines != null && examines.size() > 0) { +// for (Examine examine : examines) { +// if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { +// String experieNum = examine.getExperieNum(); +// String[] split = experieNum.split(","); +// count += split.length; +// } +// } +// } +// entrust.setSimpleCount(count); +// } +// } +// } +// iPage.setTotal(entrustList.size()); +// List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); +// iPage.setRecords(collect); +// return R.data(iPage); +// } +// } +// // 科室三 +// if (entry.getDeptId().equals("1536303317815422978")) { +// //组长或校核人 +// if (entry.getRoleId().equals("1432876219952791554") || entry.getRoleId().equals("1542095624162525185")) { +// query.setDescs("update_time"); +// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(entry); +// if (entry.getEntrustCustomerName() != null) { +// wrapper1.like(Entrust::getEntrustCustomerName, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getAcceptanceNum, entry.getEntrustCustomerName()).or(); +// wrapper1.like(Entrust::getSimpleName, entry.getEntrustCustomerName()); +// } +// IPage iPage = service.page(Condition.getPage(query), wrapper1); +// +// List entrustList = new ArrayList<>(); +// LambdaQueryWrapper eTaskLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// eTaskLambdaQueryWrapper.eq(ETask::getDeptId, entry.getDeptId()); +// List eTasks = eTaskService.list(eTaskLambdaQueryWrapper); +// if (eTasks != null && eTasks.size() > 0) { +// for (ETask eTask : eTasks) { +// if (eTask != null) { +// TaskBlueprint taskBlueprint = blueprintService.getById(eTask.getTaskBlueprintId()); +// if (taskBlueprint != null) { +// Entrust entrust = service.getById(taskBlueprint.getEntrustId()); +// if (entrust != null) { +// // 待分配 +// if ("000".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// entrustList.add(entrust); +// } +// } +// //检测中 +// else if ("111".equals(entry.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// entrustList.add(entrust); +// } +// } +// //待审核 +// else if ("3".equals(entry.getEntrustStatus())) { +// if ("3".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //通过 +// else if ("4".equals(entry.getEntrustStatus())) { +// if ("4".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //驳回 +// else if ("5".equals(entry.getEntrustStatus())) { +// if ("5".equals(entrust.getEntrustStatus())) { +// entrustList.add(entrust); +// } +// } +// //全部 +// else if ("111".equals(entrust.getEntrustStatus()) || +// "3".equals(entrust.getEntrustStatus()) || +// "4".equals(entrust.getEntrustStatus()) || +// "5".equals(entrust.getEntrustStatus())) { +// if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 0) { +// entrust.setActualDistrib("0"); +// } else if ("111".equals(entrust.getEntrustStatus()) && eTask.getStatus() == 1) { +// entrust.setActualDistrib("1"); +// } +// entrustList.add(entrust); +// } +// } +// } +// } +// } +// } +// if (entrustList != null && entrustList.size() > 0) { +// for (Entrust entrust : entrustList) { +// Integer count = 0; +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// if (entrust != null) { +// queryWrapper.eq(Examine::getEntrustId, entrust.getId()); +// queryWrapper.eq(Examine::getDeptId, "1536303317815422978"); +// List examines = examineService.list(queryWrapper); +// if (examines != null && examines.size() > 0) { +// for (Examine examine : examines) { +// if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { +// String experieNum = examine.getExperieNum(); +// String[] split = experieNum.split(","); +// count += split.length; +// } +// } +// } +// entrust.setSimpleCount(count); +// } +// } +// } +// iPage.setTotal(entrustList.size()); +// List collect = entrustList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList()); +// iPage.setRecords(collect); +// return R.data(iPage); +// } +// } +// } // TODO 抽空抽... // 检测中状态 if (entry != null && entry.getEntrustStatus() != null && "111".equals(entry.getEntrustStatus())) { @@ -461,7 +461,6 @@ public class EntrustController extends BladeController { @GetMapping("/getEntrust") public R> getEntrust(String id, String roleId, String deptId, String userId) { HashMap map = new HashMap<>(); - //科室主任 if ("1123598816738675203".equals(roleId)) { //委托单 @@ -1253,7 +1252,7 @@ public class EntrustController extends BladeController { if (userList != null) { for (User user : userList) { messageClient.event(SysTypeEnum.INFORM.getValue(), "生成报告", - "你有新的委托单报告待生成,请及时查看", 1, 5, user.getId().toString(),"/plugin/workflow/process/entrust"); + "你有新的委托单报告待生成,请及时查看", 1, 5, user.getId().toString(), "/plugin/workflow/process/entrust"); } } } @@ -1575,7 +1574,7 @@ public class EntrustController extends BladeController { */ @GetMapping("/simpleRegisterPrint") public void simpleRegisterPrint(String id, HttpServletResponse response) throws IOException { - service.simpleRegisterPrint(id,response); + service.simpleRegisterPrint(id, response); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustCustomerController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustCustomerController.java index 2dc0fe3..4c1ead3 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustCustomerController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustCustomerController.java @@ -39,7 +39,7 @@ public class EntrustCustomerController extends BladeController { @ApiOperationSupport(order = 2) public R> list(EntrustCustomer entry, Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EntrustCustomer::getStatus,entry.getStatus()); + wrapper.eq(EntrustCustomer::getStatus, entry.getStatus()); if (entry.getName() != null && !"".equals(entry.getName())) { wrapper.and(wq -> wq .like(EntrustCustomer::getName, entry.getName()).or() diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentUseLogController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentUseLogController.java index 710db9a..7aecabc 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentUseLogController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentUseLogController.java @@ -24,6 +24,8 @@ import java.util.Date; /** + * + * * @author swj * @since 2022年6月1日19:49:10 */ @@ -34,7 +36,6 @@ import java.util.Date; public class ReagentUseLogController extends BladeController { private final IReagentUseLogService service; - /** * 分页 */ 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 829b57c..8cf7df0 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 @@ -688,7 +688,9 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("3", examine.getSimpleName()); result.put("4", examine.getSimpleCount()); result.put("5", examineItem.getName()); - result.put("6", examineBasis.getName()); + if (examineBasis != null) { + result.put("6", examineBasis.getName()); + } // 诊断试剂 String[] split1 = examineResult.getReagentId().split(","); String regentName = ""; @@ -725,7 +727,9 @@ public class EntrustServiceImpl extends BaseServiceImpl } result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); result.put("12", examineWay.getOperation()); - result.put("13", examineBasis.getContent()); + if (examineBasis != null) { + result.put("13", examineBasis.getContent()); + } String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 检测人 if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index d6017aa..adc0e90 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -86,7 +86,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Train::getTeacher, teacher.getTeacherId()); + wrapper.orderByDesc(Train::getCreateTime); + List list = trainService.list(wrapper); + if (list != null && list.size() > 0) { + teacher.setRecentTrain(list.get(0).getName()); + } teacher.setEducation(user.getEducation()); teacher.setTel(user.getPhone()); teacher.setPraise(0); diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java index 628d880..bf630d8 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -406,6 +406,7 @@ public class UserController { // 实际人员数量 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(User::getIsDeleted, 0); + wrapper.eq(User::getTenantId, 704067L); int count = userService.count(wrapper); // 额定人数 double rated = 40.00; @@ -418,7 +419,7 @@ public class UserController { } // 硕士及以上人数 wrapper.clear(); - wrapper.eq(User::getEducation, ""); + wrapper.eq(User::getEducation, "2"); int count1 = userService.count(wrapper); // 硕士以下人数 int count2 = count - count1;