Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/contractor/TBreakRulesPersonRecordController.java

+package com.zehong.web.controller.contractor;
+
+import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.TContractor;
+import com.zehong.system.service.ISysUserService;
+import com.zehong.system.service.ITContractorService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TBreakRulesPersonRecord;
+import com.zehong.system.service.ITBreakRulesPersonRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 违章人员记录Controller
+ * 
+ * @author zehong
+ * @date 2023-02-11
+ */
+@RestController
+@RequestMapping("/breakRulesPerson/record")
+public class TBreakRulesPersonRecordController extends BaseController
+{
+    @Autowired
+    private ITBreakRulesPersonRecordService tBreakRulesPersonRecordService;
+
+    @Autowired
+    private ITContractorService tContractorService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    /**
+     * 查询违章人员记录列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        startPage();
+        List<TBreakRulesPersonRecord> list = tBreakRulesPersonRecordService.selectTBreakRulesPersonRecordList(tBreakRulesPersonRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出违章人员记录列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "违章人员记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        List<TBreakRulesPersonRecord> list = tBreakRulesPersonRecordService.selectTBreakRulesPersonRecordList(tBreakRulesPersonRecord);
+        for(TBreakRulesPersonRecord record : list){
+            if(null !=record.getContractId()){
+                TContractor contractor = tContractorService.selectTContractorById(record.getContractId());
+                record.setContractName(contractor.getContractorName());
+            }
+            SysUser user = iSysUserService.selectUserById(record.getReportPerson());
+            record.setReportPersonName(user.getNickName());
+        }
+        ExcelUtil<TBreakRulesPersonRecord> util = new ExcelUtil<TBreakRulesPersonRecord>(TBreakRulesPersonRecord.class);
+        return util.exportExcel(list, "违章人员记录数据");
+    }
+
+    /**
+     * 获取违章人员记录详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:query')")
+    @GetMapping(value = "/{breakRulesPersonId}")
+    public AjaxResult getInfo(@PathVariable("breakRulesPersonId") Long breakRulesPersonId)
+    {
+        return AjaxResult.success(tBreakRulesPersonRecordService.selectTBreakRulesPersonRecordById(breakRulesPersonId));
+    }
+
+    /**
+     * 新增违章人员记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:add')")
+    @Log(title = "违章人员记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        return toAjax(tBreakRulesPersonRecordService.insertTBreakRulesPersonRecord(tBreakRulesPersonRecord));
+    }
+
+    /**
+     * 修改违章人员记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:edit')")
+    @Log(title = "违章人员记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        return toAjax(tBreakRulesPersonRecordService.updateTBreakRulesPersonRecord(tBreakRulesPersonRecord));
+    }
+
+    /**
+     * 删除违章人员记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:remove')")
+    @Log(title = "违章人员记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{breakRulesPersonIds}")
+    public AjaxResult remove(@PathVariable Long[] breakRulesPersonIds)
+    {
+        return toAjax(tBreakRulesPersonRecordService.deleteTBreakRulesPersonRecordByIds(breakRulesPersonIds));
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/domain/TBreakRulesPersonRecord.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 违章人员记录对象 t_break_rules_person_record
+ * 
+ * @author zehong
+ * @date 2023-02-11
+ */
+public class TBreakRulesPersonRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long breakRulesPersonId;
+
+    /** 承包商id */
+    private Long contractId;
+
+    /**承包商名称*/
+    @Excel(name = "承包商")
+    private String contractName;
+
+    /** 违规人员姓名 */
+    @Excel(name = "人员姓名")
+    private String breakRulesPersonName;
+
+    /** 违规时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "违规时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date breakTime;
+
+    /** 违规照片 */
+    @Excel(name = "违规照片")
+    private String breakPicUrl;
+
+    /** 违规说明 */
+    @Excel(name = "违规说明")
+    private String breakDescription;
+
+    /** 电子签名 */
+    //@Excel(name = "电子签名")
+    private String signature;
+
+    /** 上报人 */
+    private Long reportPerson;
+
+    /**上报人姓名*/
+    @Excel(name = "上报人")
+    private String reportPersonName;
+
+    /** 上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /** 是否删除(0正常，1删除) */
+    private String isDel;
+
+    private Date reportTimeBegin;
+
+    private Date reportTimeEnd;
+
+    public void setBreakRulesPersonId(Long breakRulesPersonId)
+    {
+        this.breakRulesPersonId = breakRulesPersonId;
+    }
+
+    public Long getBreakRulesPersonId() 
+    {
+        return breakRulesPersonId;
+    }
+    public void setContractId(Long contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public Long getContractId() 
+    {
+        return contractId;
+    }
+    public void setBreakRulesPersonName(String breakRulesPersonName) 
+    {
+        this.breakRulesPersonName = breakRulesPersonName;
+    }
+
+    public String getBreakRulesPersonName() 
+    {
+        return breakRulesPersonName;
+    }
+    public void setBreakTime(Date breakTime) 
+    {
+        this.breakTime = breakTime;
+    }
+
+    public Date getBreakTime() 
+    {
+        return breakTime;
+    }
+    public void setBreakPicUrl(String breakPicUrl) 
+    {
+        this.breakPicUrl = breakPicUrl;
+    }
+
+    public String getBreakPicUrl() 
+    {
+        return breakPicUrl;
+    }
+    public void setBreakDescription(String breakDescription) 
+    {
+        this.breakDescription = breakDescription;
+    }
+
+    public String getBreakDescription() 
+    {
+        return breakDescription;
+    }
+    public void setSignature(String signature) 
+    {
+        this.signature = signature;
+    }
+
+    public String getSignature() 
+    {
+        return signature;
+    }
+    public void setReportPerson(Long reportPerson) 
+    {
+        this.reportPerson = reportPerson;
+    }
+
+    public Long getReportPerson() 
+    {
+        return reportPerson;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public Date getReportTimeBegin() {
+        return reportTimeBegin;
+    }
+
+    public void setReportTimeBegin(Date reportTimeBegin) {
+        this.reportTimeBegin = reportTimeBegin;
+    }
+
+    public Date getReportTimeEnd() {
+        return reportTimeEnd;
+    }
+
+    public void setReportTimeEnd(Date reportTimeEnd) {
+        this.reportTimeEnd = reportTimeEnd;
+    }
+
+    public String getContractName() {
+        return contractName;
+    }
+
+    public void setContractName(String contractName) {
+        this.contractName = contractName;
+    }
+
+    public String getReportPersonName() {
+        return reportPersonName;
+    }
+
+    public void setReportPersonName(String reportPersonName) {
+        this.reportPersonName = reportPersonName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("breakRulesPersonId", getBreakRulesPersonId())
+            .append("contractId", getContractId())
+            .append("breakRulesPersonName", getBreakRulesPersonName())
+            .append("breakTime", getBreakTime())
+            .append("breakPicUrl", getBreakPicUrl())
+            .append("breakDescription", getBreakDescription())
+            .append("signature", getSignature())
+            .append("reportPerson", getReportPerson())
+            .append("reportTime", getReportTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -2,9 +2,12 @@ package com.zehong.system.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 设备信息管理对象 t_device_info
  * 
@@ -18,171 +21,176 @@ public class TDeviceInfo extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String tagNumber;
+
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String deviceName;
 
-    /** 设备编码 */
-    @Excel(name = "设备编码")
-    private String deviceCode;
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specifications;
 
-    /** 设备状态（0正常 1报警 2离线） */
-    private String deviceStatus;
+    /** 技术性能 */
+    @Excel(name = "技术性能")
+    private String function;
 
-    /** 设备类型 */
-    @Excel(name = "设备类型(液位探测器/气体报警器/压力报警器)", readConverterExp = "1=液位探测器,2=气体报警器,3=压力报警器")
-    private String deviceType;
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
 
-    /** 位号 */
-    @Excel(name = "位号")
-    private String tagNumber;
+    /** 制造厂家 */
+    @Excel(name = "制造厂家")
+    private String manufactor;
 
-    /** 设备等级 */
-    @Excel(name = "设备等级(一级危险源/二级危险源/三级危险源)", readConverterExp = "1=一级危险源,2=二级危险源,3=三级危险源")
-    private String deviceGrade;
+    /** 所属车间 */
+    @Excel(name = "所属车间", readConverterExp = "1=电仪车间,2=化工车间,3=热电车间,4=压缩车间,5=尿素车间,6=制气车间,7=维修车间")
+    private String shop;
 
-    /** 安装位置 */
-    @Excel(name = "安装位置")
-    private String installLocation;
+    /** 投运时间 */
+    @Excel(name = "投运时间(xxxx-xx-xx)", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date commissionDate;
 
-    /** 是否特种设备（0否，1是） */
-    @Excel(name = "是否特种设备(是/否)", readConverterExp = "0=否,1=是")
-    private String isSpecial;
+    /** 设备状态 */
+    @Excel(name = "设备状态", readConverterExp = "0=运行,1=备用,2=检修")
+    private String deviceStatus;
 
-    /** 负责人 */
-    @Excel(name = "负责人")
-    private String responsiblePerson;
+    /** 设备分类 */
+    @Excel(name = "设备分类(动设备/静设备)", readConverterExp = "1=动设备,2=静设备")
+    private String classify;
+
+    /** 分级 */
+    @Excel(name = "分级")
+    private String deviceGrade;
 
-    /** 负责人电话 */
-    @Excel(name = "负责人电话")
-    private String responsiblePhone;
+    /** 是否特种设备（0否，1是） */
+    @Excel(name = "是否特种设备(否/是)", readConverterExp = "0=否,1=是")
+    private String isSpecial;
 
-    /** 备注信息 */
-    @Excel(name = "备注信息")
-    private String remarks;
+    /** 特种设备类型 */
+    @Excel(name = "特种设备类型(预防事故设施/控制事故设施/减少与消除事故影响设施)", readConverterExp = "1=预防事故设施,2=控制事故设施,3=减少与消除事故影响设施")
+    private String deviceType;
 
-    /** 是否作废(0正常，1作废) */
-    @Excel(name = "是否作废(0正常，1作废)")
+    /** 是否报废(0正常，1报废) */
+    @Excel(name = "是否报废(否/是)", readConverterExp = "0=否,1=是")
     private String isCancel;
 
     /** 是否删除(0正常，1删除) */
     private String isDel;
 
-    public void setId(Long id) 
-    {
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public String getTagNumber() {
+        return tagNumber;
     }
-    public void setDeviceName(String deviceName) 
-    {
-        this.deviceName = deviceName;
+
+    public void setTagNumber(String tagNumber) {
+        this.tagNumber = tagNumber;
     }
 
-    public String getDeviceName() 
-    {
+    public String getDeviceName() {
         return deviceName;
     }
-    public void setDeviceCode(String deviceCode) 
-    {
-        this.deviceCode = deviceCode;
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
     }
 
-    public String getDeviceCode() 
-    {
-        return deviceCode;
+    public String getSpecifications() {
+        return specifications;
     }
-    public void setDeviceStatus(String deviceStatus) 
-    {
-        this.deviceStatus = deviceStatus;
+
+    public void setSpecifications(String specifications) {
+        this.specifications = specifications;
     }
 
-    public String getDeviceStatus() 
-    {
-        return deviceStatus;
+    public String getFunction() {
+        return function;
     }
-    public void setDeviceType(String deviceType) 
-    {
-        this.deviceType = deviceType;
+
+    public void setFunction(String function) {
+        this.function = function;
     }
 
-    public String getDeviceType() 
-    {
-        return deviceType;
+    public String getMedium() {
+        return medium;
     }
-    public void setTagNumber(String tagNumber) 
-    {
-        this.tagNumber = tagNumber;
+
+    public void setMedium(String medium) {
+        this.medium = medium;
     }
 
-    public String getTagNumber() 
-    {
-        return tagNumber;
+    public String getManufactor() {
+        return manufactor;
     }
-    public void setDeviceGrade(String deviceGrade) 
-    {
-        this.deviceGrade = deviceGrade;
+
+    public void setManufactor(String manufactor) {
+        this.manufactor = manufactor;
     }
 
-    public String getDeviceGrade() 
-    {
-        return deviceGrade;
+    public String getShop() {
+        return shop;
     }
-    public void setInstallLocation(String installLocation) 
-    {
-        this.installLocation = installLocation;
+
+    public void setShop(String shop) {
+        this.shop = shop;
     }
 
-    public String getInstallLocation() 
-    {
-        return installLocation;
+    public Date getCommissionDate() {
+        return commissionDate;
     }
-    public void setIsSpecial(String isSpecial) 
-    {
-        this.isSpecial = isSpecial;
+
+    public void setCommissionDate(Date commissionDate) {
+        this.commissionDate = commissionDate;
     }
 
-    public String getIsSpecial() 
-    {
-        return isSpecial;
+    public String getDeviceStatus() {
+        return deviceStatus;
     }
-    public void setResponsiblePerson(String responsiblePerson) 
-    {
-        this.responsiblePerson = responsiblePerson;
+
+    public void setDeviceStatus(String deviceStatus) {
+        this.deviceStatus = deviceStatus;
     }
 
-    public String getResponsiblePerson() 
-    {
-        return responsiblePerson;
+    public String getDeviceType() {
+        return deviceType;
     }
-    public void setResponsiblePhone(String responsiblePhone) 
-    {
-        this.responsiblePhone = responsiblePhone;
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
     }
 
-    public String getResponsiblePhone() 
-    {
-        return responsiblePhone;
+    public String getClassify() {
+        return classify;
     }
-    public void setIsDel(String isDel) 
-    {
-        this.isDel = isDel;
+
+    public void setClassify(String classify) {
+        this.classify = classify;
     }
 
-    public String getIsDel() 
-    {
-        return isDel;
+    public String getDeviceGrade() {
+        return deviceGrade;
     }
 
-    public String getRemarks() {
-        return remarks;
+    public void setDeviceGrade(String deviceGrade) {
+        this.deviceGrade = deviceGrade;
     }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public String getIsSpecial() {
+        return isSpecial;
+    }
+
+    public void setIsSpecial(String isSpecial) {
+        this.isSpecial = isSpecial;
     }
 
     public String getIsCancel() {
@@ -192,4 +200,12 @@ public class TDeviceInfo extends BaseEntity
     public void setIsCancel(String isCancel) {
         this.isCancel = isCancel;
     }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
 }

danger-manage-system/src/main/java/com/zehong/system/domain/TSpecialDeviceRecord.java

@@ -27,9 +27,9 @@ public class TSpecialDeviceRecord extends BaseEntity
     @Excel(name = "对应类型")
     private String operateType;
 
-    /** 设备编号 */
-    @Excel(name = "设备编号")
-    private String deviceCode;
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String tagNumber;
 
     /** 设备id */
     private Long deviceId;
@@ -46,14 +46,12 @@ public class TSpecialDeviceRecord extends BaseEntity
     /** 是否删除 */
     private String isDel;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
+    public Long getId() {
+        return id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public String getOperateCode() {
@@ -64,14 +62,20 @@ public class TSpecialDeviceRecord extends BaseEntity
         this.operateCode = operateCode;
     }
 
-    public void setDeviceCode(String deviceCode)
-    {
-        this.deviceCode = deviceCode;
+    public String getOperateType() {
+        return operateType;
+    }
+
+    public void setOperateType(String operateType) {
+        this.operateType = operateType;
+    }
+
+    public String getTagNumber() {
+        return tagNumber;
     }
 
-    public String getDeviceCode() 
-    {
-        return deviceCode;
+    public void setTagNumber(String tagNumber) {
+        this.tagNumber = tagNumber;
     }
 
     public Long getDeviceId() {
@@ -82,24 +86,14 @@ public class TSpecialDeviceRecord extends BaseEntity
         this.deviceId = deviceId;
     }
 
-    public String getOperateType() {
-        return operateType;
-    }
-
-    public void setOperateType(String operateType) {
-        this.operateType = operateType;
+    public Date getEffectiveDate() {
+        return effectiveDate;
     }
 
-    public void setEffectiveDate(Date effectiveDate)
-    {
+    public void setEffectiveDate(Date effectiveDate) {
         this.effectiveDate = effectiveDate;
     }
 
-    public Date getEffectiveDate() 
-    {
-        return effectiveDate;
-    }
-
     public String getRecordStatus() {
         return recordStatus;
     }

danger-manage-system/src/main/java/com/zehong/system/mapper/TBreakRulesPersonRecordMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TBreakRulesPersonRecord;
+
+/**
+ * 违章人员记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-02-11
+ */
+public interface TBreakRulesPersonRecordMapper 
+{
+    /**
+     * 查询违章人员记录
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 违章人员记录
+     */
+    public TBreakRulesPersonRecord selectTBreakRulesPersonRecordById(Long breakRulesPersonId);
+
+    /**
+     * 查询违章人员记录列表
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 违章人员记录集合
+     */
+    public List<TBreakRulesPersonRecord> selectTBreakRulesPersonRecordList(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 新增违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    public int insertTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 修改违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    public int updateTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 删除违章人员记录
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 结果
+     */
+    public int deleteTBreakRulesPersonRecordById(Long breakRulesPersonId);
+
+    /**
+     * 批量删除违章人员记录
+     * 
+     * @param breakRulesPersonIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBreakRulesPersonRecordByIds(Long[] breakRulesPersonIds);
+}

danger-manage-system/src/main/java/com/zehong/system/service/ITBreakRulesPersonRecordService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TBreakRulesPersonRecord;
+
+/**
+ * 违章人员记录Service接口
+ * 
+ * @author zehong
+ * @date 2023-02-11
+ */
+public interface ITBreakRulesPersonRecordService 
+{
+    /**
+     * 查询违章人员记录
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 违章人员记录
+     */
+    public TBreakRulesPersonRecord selectTBreakRulesPersonRecordById(Long breakRulesPersonId);
+
+    /**
+     * 查询违章人员记录列表
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 违章人员记录集合
+     */
+    public List<TBreakRulesPersonRecord> selectTBreakRulesPersonRecordList(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 新增违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    public int insertTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 修改违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    public int updateTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord);
+
+    /**
+     * 批量删除违章人员记录
+     * 
+     * @param breakRulesPersonIds 需要删除的违章人员记录ID
+     * @return 结果
+     */
+    public int deleteTBreakRulesPersonRecordByIds(Long[] breakRulesPersonIds);
+
+    /**
+     * 删除违章人员记录信息
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 结果
+     */
+    public int deleteTBreakRulesPersonRecordById(Long breakRulesPersonId);
+}

danger-manage-system/src/main/java/com/zehong/system/service/impl/TBreakRulesPersonRecordServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TBreakRulesPersonRecordMapper;
+import com.zehong.system.domain.TBreakRulesPersonRecord;
+import com.zehong.system.service.ITBreakRulesPersonRecordService;
+
+/**
+ * 违章人员记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-02-11
+ */
+@Service
+public class TBreakRulesPersonRecordServiceImpl implements ITBreakRulesPersonRecordService 
+{
+    @Autowired
+    private TBreakRulesPersonRecordMapper tBreakRulesPersonRecordMapper;
+
+    /**
+     * 查询违章人员记录
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 违章人员记录
+     */
+    @Override
+    public TBreakRulesPersonRecord selectTBreakRulesPersonRecordById(Long breakRulesPersonId)
+    {
+        return tBreakRulesPersonRecordMapper.selectTBreakRulesPersonRecordById(breakRulesPersonId);
+    }
+
+    /**
+     * 查询违章人员记录列表
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 违章人员记录
+     */
+    @Override
+    public List<TBreakRulesPersonRecord> selectTBreakRulesPersonRecordList(TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        return tBreakRulesPersonRecordMapper.selectTBreakRulesPersonRecordList(tBreakRulesPersonRecord);
+    }
+
+    /**
+     * 新增违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    @Override
+    public int insertTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        return tBreakRulesPersonRecordMapper.insertTBreakRulesPersonRecord(tBreakRulesPersonRecord);
+    }
+
+    /**
+     * 修改违章人员记录
+     * 
+     * @param tBreakRulesPersonRecord 违章人员记录
+     * @return 结果
+     */
+    @Override
+    public int updateTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord)
+    {
+        return tBreakRulesPersonRecordMapper.updateTBreakRulesPersonRecord(tBreakRulesPersonRecord);
+    }
+
+    /**
+     * 批量删除违章人员记录
+     * 
+     * @param breakRulesPersonIds 需要删除的违章人员记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBreakRulesPersonRecordByIds(Long[] breakRulesPersonIds)
+    {
+        return tBreakRulesPersonRecordMapper.deleteTBreakRulesPersonRecordByIds(breakRulesPersonIds);
+    }
+
+    /**
+     * 删除违章人员记录信息
+     * 
+     * @param breakRulesPersonId 违章人员记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBreakRulesPersonRecordById(Long breakRulesPersonId)
+    {
+        return tBreakRulesPersonRecordMapper.deleteTBreakRulesPersonRecordById(breakRulesPersonId);
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java

@@ -126,32 +126,32 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
         {
             try
             {
-                // 验证是否存在这个用户
-                TDeviceInfo d = new TDeviceInfo();
-                d.setDeviceCode(device.getDeviceCode());
-                List<TDeviceInfo> list = tDeviceInfoMapper.selectTDeviceInfoList(d);
-                if (list.size() == 0)
-                {
+//                // 验证是否存在这个设备位号
+//                TDeviceInfo d = new TDeviceInfo();
+//                d.setTagNumber(device.getTagNumber());
+//                List<TDeviceInfo> list = tDeviceInfoMapper.selectTDeviceInfoList(d);
+//                if (list.size() == 0)
+//                {
                     this.insertTDeviceInfo(device);
                     successNum++;
-//                    successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
-                    this.updateTDeviceInfo(device);
-                    successNum++;
-//                    successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 更新成功");
-                }
-                else
-                {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、设备编号 " + device.getDeviceCode() + " 已存在");
-                }
+////                    successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入成功");
+//                }
+//                else if (isUpdateSupport)
+//                {
+//                    this.updateTDeviceInfo(device);
+//                    successNum++;
+////                    successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 更新成功");
+//                }
+//                else
+//                {
+//                    failureNum++;
+//                    failureMsg.append("<br/>" + failureNum + "、设备位号 " + device.getTagNumber() + " 已存在");
+//                }
             }
             catch (Exception e)
             {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、设备 " + device.getDeviceName() + "(" + device.getTagNumber() + ")" + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TMaintainPlanServiceImpl.java

@@ -68,7 +68,7 @@ public class TMaintainPlanServiceImpl implements ITMaintainPlanService
             TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(Long.valueOf(id));
 
             TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
-            tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
+            tSpecialDeviceRecord.setTagNumber(tDeviceInfo.getTagNumber());
             tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
             tSpecialDeviceRecord.setOperateCode(planCode);
             tSpecialDeviceRecord.setOperateType("1");

danger-manage-system/src/main/java/com/zehong/system/service/impl/TRepairOrderServiceImpl.java

@@ -66,7 +66,7 @@ public class TRepairOrderServiceImpl implements ITRepairOrderService
         TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(tRepairOrder.getDeviceId());
 
         TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
-        tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
+        tSpecialDeviceRecord.setTagNumber(tDeviceInfo.getTagNumber());
         tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
         tSpecialDeviceRecord.setOperateCode(repairCode);
         tSpecialDeviceRecord.setOperateType("2");

danger-manage-system/src/main/resources/mapper/system/TBreakRulesPersonRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TBreakRulesPersonRecordMapper">
+    
+    <resultMap type="TBreakRulesPersonRecord" id="TBreakRulesPersonRecordResult">
+        <result property="breakRulesPersonId"    column="break_rules_person_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="breakRulesPersonName"    column="break_rules_person_name"    />
+        <result property="breakTime"    column="break_time"    />
+        <result property="breakPicUrl"    column="break_pic_url"    />
+        <result property="breakDescription"    column="break_description"    />
+        <result property="signature"    column="signature"    />
+        <result property="reportPerson"    column="report_person"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTBreakRulesPersonRecordVo">
+        select break_rules_person_id, contract_id, break_rules_person_name, break_time, break_pic_url, break_description, signature, report_person, report_time, is_del, remark from t_break_rules_person_record
+    </sql>
+
+    <select id="selectTBreakRulesPersonRecordList" parameterType="TBreakRulesPersonRecord" resultMap="TBreakRulesPersonRecordResult">
+        <include refid="selectTBreakRulesPersonRecordVo"/>
+        <where>  
+            <if test="contractId != null "> and contract_id = #{contractId}</if>
+            <if test="breakRulesPersonName != null  and breakRulesPersonName != ''"> and break_rules_person_name like concat('%', #{breakRulesPersonName}, '%')</if>
+            <if test="breakTime != null "> and break_time = #{breakTime}</if>
+            <if test="breakPicUrl != null  and breakPicUrl != ''"> and break_pic_url = #{breakPicUrl}</if>
+            <if test="breakDescription != null  and breakDescription != ''"> and break_description = #{breakDescription}</if>
+            <if test="signature != null  and signature != ''"> and signature = #{signature}</if>
+            <if test="reportPerson != null "> and report_person = #{reportPerson}</if>
+            <if test="reportTimeBegin != null and reportTimeEnd != null"> and report_time BETWEEN #{ reportTimeBegin } AND #{ reportTimeEnd }</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+        ORDER BY report_time DESC
+    </select>
+    
+    <select id="selectTBreakRulesPersonRecordById" parameterType="Long" resultMap="TBreakRulesPersonRecordResult">
+        <include refid="selectTBreakRulesPersonRecordVo"/>
+        where break_rules_person_id = #{breakRulesPersonId}
+    </select>
+        
+    <insert id="insertTBreakRulesPersonRecord" parameterType="TBreakRulesPersonRecord" useGeneratedKeys="true" keyProperty="breakRulesPersonId">
+        insert into t_break_rules_person_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">contract_id,</if>
+            <if test="breakRulesPersonName != null">break_rules_person_name,</if>
+            <if test="breakTime != null">break_time,</if>
+            <if test="breakPicUrl != null">break_pic_url,</if>
+            <if test="breakDescription != null">break_description,</if>
+            <if test="signature != null">signature,</if>
+            <if test="reportPerson != null">report_person,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">#{contractId},</if>
+            <if test="breakRulesPersonName != null">#{breakRulesPersonName},</if>
+            <if test="breakTime != null">#{breakTime},</if>
+            <if test="breakPicUrl != null">#{breakPicUrl},</if>
+            <if test="breakDescription != null">#{breakDescription},</if>
+            <if test="signature != null">#{signature},</if>
+            <if test="reportPerson != null">#{reportPerson},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBreakRulesPersonRecord" parameterType="TBreakRulesPersonRecord">
+        update t_break_rules_person_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="breakRulesPersonName != null">break_rules_person_name = #{breakRulesPersonName},</if>
+            <if test="breakTime != null">break_time = #{breakTime},</if>
+            <if test="breakPicUrl != null">break_pic_url = #{breakPicUrl},</if>
+            <if test="breakDescription != null">break_description = #{breakDescription},</if>
+            <if test="signature != null">signature = #{signature},</if>
+            <if test="reportPerson != null">report_person = #{reportPerson},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where break_rules_person_id = #{breakRulesPersonId}
+    </update>
+
+    <delete id="deleteTBreakRulesPersonRecordById" parameterType="Long">
+        delete from t_break_rules_person_record where break_rules_person_id = #{breakRulesPersonId}
+    </delete>
+
+    <delete id="deleteTBreakRulesPersonRecordByIds" parameterType="String">
+        delete from t_break_rules_person_record where break_rules_person_id in 
+        <foreach item="breakRulesPersonId" collection="array" open="(" separator="," close=")">
+            #{breakRulesPersonId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -7,43 +7,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TDeviceInfo" id="TDeviceInfoResult">
         <result property="id"    column="id"    />
         <result property="deviceName"    column="device_name"    />
-        <result property="deviceCode"    column="device_code"    />
-        <result property="deviceStatus"    column="device_status"    />
         <result property="deviceType"    column="device_type"    />
+        <result property="classify"    column="classify"    />
         <result property="tagNumber"    column="tag_number"    />
+        <result property="specifications"    column="specifications"    />
+        <result property="function"    column="function"    />
+        <result property="medium"    column="medium"    />
+        <result property="manufactor"    column="manufactor"    />
+        <result property="shop"    column="shop"    />
+        <result property="commissionDate"    column="commission_date"    />
+        <result property="deviceStatus"    column="device_status"    />
         <result property="deviceGrade"    column="device_grade"    />
-        <result property="installLocation"    column="install_location"    />
+        <result property="isCancel"    column="is_cancel"    />
         <result property="isSpecial"    column="is_special"    />
-        <result property="responsiblePerson"    column="responsible_person"    />
-        <result property="responsiblePhone"    column="responsible_phone"    />
+        <result property="isDel"    column="is_del"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="isCancel"    column="is_cancel"    />
-        <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTDeviceInfoVo">
-        select id, device_name, device_code, device_status, device_type, tag_number, device_grade, install_location, is_special, responsible_person, responsible_phone, create_time, update_time, is_cancel, is_del, remarks from t_device_info
+        select id, device_name, device_type, classify, tag_number, specifications, function, medium, manufactor, shop, commission_date, device_status, device_grade, is_cancel, is_special, is_del, create_time, update_time from t_device_info
     </sql>
 
     <select id="selectTDeviceInfoList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
         <include refid="selectTDeviceInfoVo"/>
         <where>  is_del = '0'
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="deviceCode != null  and deviceCode != ''"> and device_code like concat('%', #{deviceCode}, '%')</if>
+            <if test="tagNumber != null  and tagNumber != ''"> and tag_number like concat('%', #{tagNumber}, '%')</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
             <if test="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
-            <if test="tagNumber != null  and tagNumber != ''"> and tag_number = #{tagNumber}</if>
+            <if test="shop != null  and shop != ''"> and shop = #{shop}</if>
             <if test="deviceGrade != null  and deviceGrade != ''"> and device_grade = #{deviceGrade}</if>
             <if test="isSpecial != null  and isSpecial != ''"> and is_special = #{isSpecial}</if>
             <if test="isCancel != null  and isCancel != ''"> and is_cancel = #{isCancel}</if>
-            <if test="responsiblePhone != null  and responsiblePhone != ''"> and responsible_phone = #{responsiblePhone}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                AND date_format(commission_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                AND date_format(commission_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
     </select>
@@ -57,35 +58,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_device_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceName != null">device_name,</if>
-            <if test="deviceCode != null">device_code,</if>
-            <if test="deviceStatus != null">device_status,</if>
             <if test="deviceType != null">device_type,</if>
+            <if test="classify != null">classify,</if>
             <if test="tagNumber != null">tag_number,</if>
+            <if test="specifications != null">specifications,</if>
+            <if test="function != null">function,</if>
+            <if test="medium != null">medium,</if>
+            <if test="manufactor != null">manufactor,</if>
+            <if test="shop != null">shop,</if>
+            <if test="commissionDate != null">commission_date,</if>
+            <if test="deviceStatus != null">device_status,</if>
             <if test="deviceGrade != null">device_grade,</if>
-            <if test="installLocation != null">install_location,</if>
+            <if test="isCancel != null">is_cancel,</if>
             <if test="isSpecial != null">is_special,</if>
-            <if test="responsiblePerson != null">responsible_person,</if>
-            <if test="responsiblePhone != null">responsible_phone,</if>
+            <if test="isDel != null">is_del,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="isDel != null">is_del,</if>
-            <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceName != null">#{deviceName},</if>
-            <if test="deviceCode != null">#{deviceCode},</if>
-            <if test="deviceStatus != null">#{deviceStatus},</if>
             <if test="deviceType != null">#{deviceType},</if>
+            <if test="classify != null">#{classify},</if>
             <if test="tagNumber != null">#{tagNumber},</if>
+            <if test="specifications != null">#{specifications},</if>
+            <if test="function != null">#{function},</if>
+            <if test="medium != null">#{medium},</if>
+            <if test="manufactor != null">#{manufactor},</if>
+            <if test="shop != null">#{shop},</if>
+            <if test="commissionDate != null">#{commissionDate},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
             <if test="deviceGrade != null">#{deviceGrade},</if>
-            <if test="installLocation != null">#{installLocation},</if>
+            <if test="isCancel != null">#{isCancel},</if>
             <if test="isSpecial != null">#{isSpecial},</if>
-            <if test="responsiblePerson != null">#{responsiblePerson},</if>
-            <if test="responsiblePhone != null">#{responsiblePhone},</if>
+            <if test="isDel != null">#{isDel},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="isDel != null">#{isDel},</if>
-            <if test="remarks != null">#{remarks},</if>
          </trim>
     </insert>
 
@@ -93,20 +100,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_device_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceName != null">device_name = #{deviceName},</if>
-            <if test="deviceCode != null">device_code = #{deviceCode},</if>
-            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="classify != null">classify = #{classify},</if>
             <if test="tagNumber != null">tag_number = #{tagNumber},</if>
+            <if test="specifications != null">specifications = #{specifications},</if>
+            <if test="function != null">function = #{function},</if>
+            <if test="medium != null">medium = #{medium},</if>
+            <if test="manufactor != null">manufactor = #{manufactor},</if>
+            <if test="shop != null">shop = #{shop},</if>
+            <if test="commissionDate != null">commission_date = #{commissionDate},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
             <if test="deviceGrade != null">device_grade = #{deviceGrade},</if>
-            <if test="installLocation != null">install_location = #{installLocation},</if>
+            <if test="isCancel != null">is_cancel = #{isCancel},</if>
             <if test="isSpecial != null">is_special = #{isSpecial},</if>
-            <if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
-            <if test="responsiblePhone != null">responsible_phone = #{responsiblePhone},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
-            <if test="isCancel != null">is_cancel = #{isCancel},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id} and is_del = '0'
     </update>

danger-manage-web/src/api/contractor/breakRulesPersonRecord.js

+import request from '@/utils/request'
+
+// 查询违章人员记录列表
+export function listRecord(query) {
+  return request({
+    url: '/breakRulesPerson/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询违章人员记录详细
+export function getRecord(breakRulesPersonId) {
+  return request({
+    url: '/breakRulesPerson/record/' + breakRulesPersonId,
+    method: 'get'
+  })
+}
+
+// 新增违章人员记录
+export function addRecord(data) {
+  return request({
+    url: '/breakRulesPerson/record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改违章人员记录
+export function updateRecord(data) {
+  return request({
+    url: '/breakRulesPerson/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除违章人员记录
+export function delRecord(breakRulesPersonId) {
+  return request({
+    url: '/breakRulesPerson/record/' + breakRulesPersonId,
+    method: 'delete'
+  })
+}
+
+// 导出违章人员记录
+export function exportRecord(query) {
+  return request({
+    url: '/breakRulesPerson/record/export',
+    method: 'get',
+    params: query
+  })
+}

danger-manage-web/src/views/contractor/contractorInfo/index.vue

@@ -82,6 +82,12 @@
       <el-table-column label="承包商状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-copy"
+            @click="detailInfo(scope.row)"
+          >详情</el-button>
           <el-button
             v-if="scope.row.status == '0'"
             size="mini"
@@ -238,12 +244,139 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 详情承包商信息对话框 -->
+    <el-dialog title="信息详情" :visible.sync="openDetail" width="800px" append-to-body>
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="单位名称:" prop="contractorName">
+              <span>{{ form.contractorName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="法定代表人:" prop="legalPerson">
+              <span>{{ form.legalPerson }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人手机:" prop="legalPersonPhone">
+              <span>{{ form.legalPerson }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="主要负责人:" prop="keyPerson">
+              <span>{{ form.keyPerson }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主要负责人手机:" prop="keyPersonPhone">
+              <span>{{ form.keyPersonPhone }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="安全负责人:" prop="safetyPerson">
+              <span>{{ form.safetyPerson }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安全负责人手机:" prop="safetyPersonPhone">
+              <span>{{ form.safetyPersonPhone }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="单位资质名称:" prop="certificateName">
+              <span>{{ form.certificateName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="单位资质证照" prop="certificateUrl">
+              <img :src="form.certificateUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(form)"/>
+              <el-image :zIndex="9999" :ref="'a'+form.id" :src="form.certificateUrl" v-show="false" :preview-src-list="[form.certificateUrl]" v-if="form.certificateUrl != '' && form.certificateUrl != null"></el-image>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="团队信息记录" prop="teamInformation">
+              <span>{{ form.teamInformation }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="违章记录" prop="violationRecords">
+              <el-table class="breakTable" v-loading="loading" :data="breakRulesPersonRecords" height="250px">
+                <el-table-column label="承包商" align="center" prop="contractId" :formatter="contractorFormate" width="180"/>
+                <el-table-column label="人员姓名" align="center" prop="breakRulesPersonName" />
+                <el-table-column label="违规时间" align="center" prop="breakTime" width="180">
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.breakTime, '{y}-{m}-{d}') }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="违规照片" align="center" prop="breakPicUrl" >
+                  <template slot-scope="scope">
+                    <el-image style="height: 30px;width: 30px" size="small" :preview-src-list="[scope.row.breakPicUrl]" :src="scope.row.breakPicUrl" ></el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column label="违规说明" align="center" prop="breakDescription"  min-width="100" :show-overflow-tooltip="true"/>
+                <el-table-column label="电子签名" align="center" prop="signature" >
+                  <template slot-scope="scope">
+                    <el-image style="height: 30px;width: 30px" size="small" :preview-src-list="[scope.row.signature]" :src="scope.row.signature" ></el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column label="上报人" align="center" prop="reportPerson" :formatter="reportPersonFormate"/>
+                <el-table-column label="上报时间" align="center" prop="reportTime" width="180">
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="pageNum"
+                :limit.sync="pageSize"
+                @pagination="breakPersonRecords"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="承包商评定" prop="contractorEvaluate">
+              <el-radio-group v-model="form.contractorEvaluate" disabled>
+                <el-radio label="1">优</el-radio>
+                <el-radio label="2">中</el-radio>
+                <el-radio label="3">差</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+       <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
+        <el-button @click="openDetail = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import MyFileUpload from '@/components/MyFileUpload';
-import { listContractorInfo, getContractorInfo, delContractorInfo, addContractorInfo, updateContractorInfo, exportContractorInfo } from "@/api/contractor/contractorInfo";
+import { listContractorInfo, getContractorInfo, delContractorInfo, addContractorInfo, updateContractorInfo, exportContractorInfo,listAll } from "@/api/contractor/contractorInfo";
+import { listRecord } from "@/api/contractor/breakRulesPersonRecord";
+import { getAllUserName } from "@/api/system/user"
 
 export default {
   name: "ContractorInfo",
@@ -304,7 +437,17 @@ export default {
         contractorName: [
           { required: true, message: "请输入单位名称", trigger: "blur" }
         ],
-      }
+      },
+      openDetail:false,
+      breakRulesPersonRecords: [],
+      //承包商信息
+      contractorInfos:[],
+      userInfo:[],
+      // 总条数
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      contractId:""
     };
   },
   created() {
@@ -315,6 +458,8 @@ export default {
     this.getDicts("t_contractor_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.contractorInfo();
+    this.userInfos();
   },
   methods: {
     // 承包商评定
@@ -397,6 +542,20 @@ export default {
         this.title = "修改承包商信息";
       });
     },
+    detailInfo(row){
+      const id = row.id || this.ids
+      getContractorInfo(id).then(response => {
+        this.form = response.data;
+        if (this.form.certificateUrl) {
+          this.fileList.push({
+            url: this.form.certificateUrl,
+          });
+        }
+        this.openDetail = true;
+        this.contractId = id;
+        this.breakPersonRecords();
+      });
+    },
     /** 审核按钮操作 */
     handleApproval(row) {
       this.readOnly = true;
@@ -491,6 +650,51 @@ export default {
       this.$refs['a'+row.id].showViewer = true;
       console.log("===",row.id);
     },
+    breakPersonRecords(){
+      listRecord({contractId : this.contractId,pageNum:this.pageNum,pageSize:this.pageSize}).then(res =>{
+        if(res.code == 200){
+          this.breakRulesPersonRecords = res.rows;
+          this.total = res.total;
+        }
+      })
+    },
+    //承包商信息
+    contractorInfo(){
+      listAll().then(res =>{
+          if(res.code == 200){
+          this.contractorInfos = res.data;
+        }
+      })
+    },
+    //承包商名称
+    contractorFormate(row){
+      const contrator = this.contractorInfos.find(contractor => contractor.id == row.contractId);
+      return contrator?contrator.contractorName:"";
+    },
+    userInfos(){
+        getAllUserName().then(res =>{
+          if(res.code == 200){
+          this.userInfo = res.data;
+        }
+      })
+    },
+    //上报人信息
+    reportPersonFormate(row){
+      const user = this.userInfo.find(user =>user.userId == row.reportPerson);
+      return user?user.nickName:"";
+    },
   }
 };
 </script>
+<style lang="scss">
+  // 滚动条的宽度
+  .breakTable .el-table__body-wrapper::-webkit-scrollbar {
+    width: 8px; // 横向滚动条
+    height: 8px; // 纵向滚动条 必写
+  }
+  // 滚动条的滑块
+  .breakTable .el-table__body-wrapper::-webkit-scrollbar-thumb {
+     background-color: #ddd;
+     border-radius: 3px;
+   }
+</style>

danger-manage-web/src/views/safetyManagement/enterpriseSystem/index.vue

@@ -78,7 +78,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />-->
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -95,7 +95,7 @@
             icon="el-icon-edit"
             @click="handleDetail(scope.row)"
           >详情</el-button>
-          <!--<el-button
+          <el-button
             v-if="scope.row.status == '0'"
             size="mini"
             type="text"
@@ -108,6 +108,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleApproval(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >审批</el-button>
           <el-button
             v-if="scope.row.status == '2'"
@@ -115,7 +116,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInvalid(scope.row)"
-          >作废</el-button>-->
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
+          >作废</el-button>
           <el-button
             size="mini"
             type="text"
@@ -176,10 +178,10 @@
               </span>
               <span v-else>-</span>
             </el-form-item>
-            <!--<el-form-item v-show="operate" label="审批" prop="status">
+            <el-form-item v-show="operate" label="审批" prop="status">
               <el-radio v-model="form.status" label="2">通过</el-radio>
               <el-radio v-model="form.status" label="0">驳回</el-radio>
-            </el-form-item>-->
+            </el-form-item>
           </div>
           <div style="width: 58%;margin-left: 2%">
             <div class="dialogTitle">制度内容</div>
@@ -312,6 +314,7 @@ export default {
       };
       this.resetForm("form");
       this.fileList = [];
+      this.operate=false;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -362,7 +365,7 @@ export default {
     },
     /** 审批按钮操作 */
     handleApproval(row) {
-      this.readOnly = true;
+      this.readOnly = false;
       this.reset();
       const systemId = row.systemId || this.ids
       getEnterpriseSystem(systemId).then(response => {

danger-manage-web/src/views/safetyManagement/laws/index.vue

@@ -84,9 +84,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />-->
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150px" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210px" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -101,12 +101,13 @@
             icon="el-icon-edit"
             @click="handleDetail(scope.row)"
           >详情</el-button>
-          <!--<el-button
+          <el-button
             v-if="scope.row.status == '0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handlePublish(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >发布</el-button>
           <el-button
             v-if="scope.row.status == '1'"
@@ -114,6 +115,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleApproval(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >审批</el-button>
           <el-button
             v-if="scope.row.status == '2'"
@@ -121,7 +123,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInvalid(scope.row)"
-          >作废</el-button>-->
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
+          >作废</el-button>
           <el-button
             size="mini"
             type="text"
@@ -198,10 +201,10 @@
               </span>
               <span v-else>-</span>
             </el-form-item>
-            <!--<el-form-item v-show="operate" label="审批" prop="status">
+            <el-form-item v-show="operate" label="审批" prop="status">
               <el-radio v-model="form.status" label="2">通过</el-radio>
               <el-radio v-model="form.status" label="0">驳回</el-radio>
-            </el-form-item>-->
+            </el-form-item>
           </div>
           <div style="width: 58%;margin-left: 2%">
             <div class="dialogTitle">法律法规内容</div>
@@ -333,6 +336,7 @@ export default {
       };
       this.resetForm("form");
       this.fileList = [];
+      this.operate=false;
     },
     /** 搜索按钮操作 */
     handleQuery() {

pom.xml

@@ -23,7 +23,7 @@
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
-        <fastjson.version>1.2.76</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>5.6.0</oshi.version>
         <jna.version>5.7.0</jna.version>
         <commons.io.version>2.5</commons.io.version>