Merge remote-tracking branch 'origin/master'

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasApply.java

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,9 +48,11 @@ public class UsegasApply extends BaseBean {
     @ApiModelProperty("联系方式")
     private String phone;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("期限开始")
     private Date startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("期限结束")
     private Date endTime;
 
@@ -83,4 +86,7 @@ public class UsegasApply extends BaseBean {
     @ApiModelProperty("原因（实验室负责人）")
     private String leadAuditCause;
 
+    @ApiModelProperty("用气申请表地址")
+    private String useGasFile;
+
 }

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UsegasApplyVo.java

@@ -1,5 +1,6 @@
 package com.zd.bottle.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.bottle.domain.UsegasApply;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -31,10 +32,8 @@ public class UsegasApplyVo extends UsegasApply {
     @ApiModelProperty(value = "使用气体")
     private String useGasName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "申请时间")
     private Date applyTime;
 
-    @ApiModelProperty(value = "当前审批人id")
-    private Long auditUserid;
-
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasAuditRecordController.java

@@ -1,10 +1,23 @@
 package com.zd.bottle.controller;
 
+import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.domain.UsegasAuditRecord;
+import com.zd.bottle.service.UsegasAuditRecordService;
+import com.zd.bottle.vo.UsegasApplyVo;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.web.controller.BaseController;
 
+import java.util.List;
+
 /**
  * <p>
  * 用气审核表 前端控制器
@@ -17,4 +30,15 @@ import com.zd.common.core.web.controller.BaseController;
 @RequestMapping("/usegasAuditRecord")
 public class UsegasAuditRecordController extends BaseController<UsegasAuditRecord> {
 
+    @Autowired
+    private UsegasAuditRecordService usegasAuditRecordService;
+
+    @ApiModelProperty(value = "审核记录表")
+    @GetMapping("/auditRecordList")
+    public TableDataInfo <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord){
+        startPage();
+        List <UsegasAuditRecord> list = usegasAuditRecordService.auditRecordList(usegasAuditRecord);
+        return getDataTable(list);
+    }
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UsegasAuditRecordService.java

@@ -3,6 +3,8 @@ package com.zd.bottle.service;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用气审核表 服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface UsegasAuditRecordService extends IService<UsegasAuditRecord> {
 
+    List <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord);
+
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasApplyServiceImpl.java

@@ -34,38 +34,7 @@ public class UsegasApplyServiceImpl extends ServiceImpl<UsegasApplyMapper, Usega
 
     @Override
     public List <UsegasApplyVo> selectUseagsApplyList(UsegasApply usegasApply) {
-        List <UsegasApplyVo> applyVos = usegasApplyMapper.selectUseagsApplyList(usegasApply);
-//        LambdaQueryWrapper <UsegasApply> wrapper = Wrappers.lambdaQuery();
-//        wrapper.setEntity(usegasApply);
-//        if(StringUtils.isNotEmpty(usegasApply.getSearchValue())){
-//            wrapper.and(
-//                    wrapper1 -> wrapper1
-//                            .like(StringUtils.isNotEmpty(usegasApply.getSearchValue()),UsegasApply::getApplyUser, "%"+usegasApply.getSearchValue()+"%")
-//                            .or()
-//                            .like(StringUtils.isNotEmpty(usegasApply.getSearchValue()),UsegasApply::getPhone, "%"+usegasApply.getSearchValue()+"%")
-//            );
-//        }
-//        List <UsegasApply> list = list(wrapper);
-//        List <UsegasApplyVo> collect = Optional.ofNullable(list).orElseGet(Collections::emptyList)
-//                .stream()
-//                .map(a -> {
-//
-//                    UsegasApplyVo usegasApplyVo = new UsegasApplyVo();
-//                    usegasApplyVo.setId(a.getId());
-//                    usegasApplyVo.setApplyUserName(a.getApplyUser());
-//                    usegasApplyVo.setApplyUserPhone(a.getPhone());
-//                    usegasApplyVo.setUseGasName(a.getUseGasName());
-//                    usegasApplyVo.setApplyTime(a.getCreateTime());
-//                    //todo 这里需要判断第一个审批人是否审批通过，如果第一个通过了，那么需要返回第二个审批人的id
-//                    if (a.getLeadAuditStaus() == 0) {
-//                        usegasApplyVo.setAuditUserid(a.getLeadAuditUserid());
-//                    } else if (a.getCenterAuditStatus() == 0) {
-//                        usegasApplyVo.setAuditUserid(a.getCenterAuditUserid());
-//                    }
-//
-//                    return usegasApplyVo;
-//                }).collect(Collectors.toList());
-        return applyVos;
+        return usegasApplyMapper.selectUseagsApplyList(usegasApply);
     }
 
     @Override

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasAuditRecordServiceImpl.java

@@ -1,11 +1,16 @@
 package com.zd.bottle.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.mapper.UsegasAuditRecordMapper;
 import com.zd.bottle.service.UsegasAuditRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用气审核表 服务实现类
@@ -17,4 +22,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class UsegasAuditRecordServiceImpl extends ServiceImpl<UsegasAuditRecordMapper, UsegasAuditRecord> implements UsegasAuditRecordService {
 
+    @Override
+    public List <UsegasAuditRecord> auditRecordList(UsegasAuditRecord usegasAuditRecord) {
+        LambdaQueryWrapper <UsegasAuditRecord> wrapper = Wrappers.lambdaQuery();
+        wrapper.ge(UsegasAuditRecord::getUsegasApplyId,usegasAuditRecord.getUsegasApplyId());
+        wrapper.setEntity(usegasAuditRecord);
+        List <UsegasAuditRecord> list = list(wrapper);
+        return list;
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -37,7 +37,8 @@
 
     <select id="selectUseagsApplyList" parameterType="com.zd.bottle.domain.UsegasApply" resultType="com.zd.bottle.vo.UsegasApplyVo">
         select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time applyTime,
-        ua.lead_audit_userid auditUserid
+        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.safety_precautions safetyPrecautions,
+        ua.use_gas_file useGasFile
         from ab_usegas_apply ua
         <where>
             <if test="searchValue != null ">

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanListVO.java

@@ -35,6 +35,21 @@ public class LabRiskPlanListVO extends BaseEntity {
     @ApiModelProperty("院系名称")
     private String groupDeptName;
 
+    @ApiModelProperty("声光报警")
+    private Integer alarmInfo;
+
+    @ApiModelProperty("电话短信")
+    private Integer phoneInfo;
+
+    @ApiModelProperty("通风")
+    private Integer windInfo;
+
+    @ApiModelProperty("电源")
+    private Integer powerInfo;
+
+    @ApiModelProperty("预案结束时间")
+    private String overTime;
+
     public String getCreateTimeStr() {
         return createTimeStr;
     }
@@ -91,4 +106,44 @@ public class LabRiskPlanListVO extends BaseEntity {
     public void setSesorContent(String sesorContent) {
         this.sesorContent = sesorContent;
     }
+
+    public Integer getAlarmInfo() {
+        return alarmInfo;
+    }
+
+    public void setAlarmInfo(Integer alarmInfo) {
+        this.alarmInfo = alarmInfo;
+    }
+
+    public Integer getPhoneInfo() {
+        return phoneInfo;
+    }
+
+    public void setPhoneInfo(Integer phoneInfo) {
+        this.phoneInfo = phoneInfo;
+    }
+
+    public Integer getWindInfo() {
+        return windInfo;
+    }
+
+    public void setWindInfo(Integer windInfo) {
+        this.windInfo = windInfo;
+    }
+
+    public Integer getPowerInfo() {
+        return powerInfo;
+    }
+
+    public void setPowerInfo(Integer powerInfo) {
+        this.powerInfo = powerInfo;
+    }
+
+    public String getOverTime() {
+        return overTime;
+    }
+
+    public void setOverTime(String overTime) {
+        this.overTime = overTime;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabControlMapper.xml

@@ -445,7 +445,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.name subject_name,
         (SELECT dt.dept_name
         FROM  sys_dept d JOIN sys_dept dt ON d.dept_id = dt.parent_id
-        WHERE d.parent_id = 0 AND FIND_IN_SET(dt.dept_id,t.`ancestors`)) groupDeptName
+        WHERE d.parent_id = 0 AND FIND_IN_SET(dt.dept_id,t.`ancestors`)) groupDeptName,
+        CASE WHEN (SELECT COUNT(pal.id) FROM lab_risk_plan_abnormal_log pal WHERE pal.`group_id` = gp.`id` AND pal.risk_status = 3 AND pal.risk_plan_name LIKE '%报警器%')>0
+        THEN 1 ELSE 0 END alarmInfo,
+        CASE WHEN (SELECT COUNT(pal.id) FROM lab_risk_plan_abnormal_log pal WHERE pal.`group_id` = gp.`id` AND pal.risk_status = 4 AND pal.risk_plan_name LIKE '%语音电话%')>0
+        THEN 1 ELSE 0 END phoneInfo,
+        CASE WHEN (SELECT COUNT(pal.id) FROM lab_risk_plan_abnormal_log pal WHERE pal.`group_id` = gp.`id` AND pal.risk_status = 3 AND pal.risk_plan_name LIKE '%智能通风%')>0
+        THEN 1 ELSE 0 END windInfo,
+        CASE WHEN (SELECT COUNT(pal.id) FROM lab_risk_plan_abnormal_log pal WHERE pal.`group_id` = gp.`id` AND pal.risk_status = 0 AND pal.risk_plan_name LIKE '%电源开关%')>0
+        THEN 1 ELSE 0 END powerInfo,
+        (SELECT pal.create_time FROM lab_risk_plan_abnormal_log pal WHERE pal.`group_id` = gp.`id` AND pal.risk_status = 2 LIMIT 1) overTime
         FROM
         lab_risk_plan_abnormal_group gp INNER JOIN lab_subject s ON gp.`subject_id` = s.`id`
         INNER JOIN lab_risk_plan_abnormal_log al ON gp.`id` = al.`group_id`