Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-28 c5138faa1c4771bfbc19de5b257e7c129c081cb8

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java

 chart-server/src/main/resources/mapper/WorkMapper.xml

@@ -7,7 +7,7 @@
        from (select distinct user.name, count(inspection_product.id) unfinish
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_pro_id = user.id
              where state = 1
              where inspection_product.state = 1
                and test_state is null
                and inspection_product.inspection_material_id in
                    (select id
@@ -23,7 +23,7 @@
             (select distinct user.name, count(inspection_product.id) finsh
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_pro_id = user.id
              where state = 1
              where inspection_product.state = 1
                and test_state is not null
                and inspection_product.inspection_material_id in
                    (select id
@@ -45,7 +45,7 @@
        from (select distinct user.name, count(inspection_product.id) unfinsh
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_id = user.id
              where state = 1
              where inspection_product.state = 1
                and test_state is null
                and inspection_product.inspection_material_id in
                    (select id
@@ -61,7 +61,7 @@
             (select distinct user.name, count(inspection_product.id) finsh
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_id = user.id
              where state = 1
              where inspection_product.state = 1
                and test_state is not null
                and inspection_product.inspection_material_id in
                    (select id
@@ -83,7 +83,7 @@
        from (select distinct user.name, count(inspection_product.id) total
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_pro_id = user.id
              where state = 1
              where inspection_product.state = 1
                and inspection_product.inspection_material_id in
                    (select id
                     from lims_laboratory.inspection_material
@@ -126,7 +126,7 @@
        from (select distinct user.name, count(inspection_product.id) total
              from lims_laboratory.inspection_product
                       left join lims_laboratory.user on inspection_product.user_id = user.id
              where state = 1
              where inspection_product.state = 1
                and inspection_product.inspection_material_id in
                    (select id
                     from lims_laboratory.inspection_material

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java

@@ -37,6 +37,10 @@
    @JsonSerialize
    private String conclusion;

    @ApiModelProperty(value = "检验类型")
    @JsonSerialize
    private int type;

    @ApiModelProperty(value = "审批状态 0：待提交 1：待审核；2：已通过 3:不通过")
    @JsonSerialize
    private Integer status;