Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/workPermit/TSpecialWorkPermitController.java

@@ -71,7 +71,7 @@ public class TSpecialWorkPermitController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TSpecialWorkPermit tSpecialWorkPermit)
     {
-        return toAjax(tSpecialWorkPermitService.insertTSpecialWorkPermit(tSpecialWorkPermit));
+        return tSpecialWorkPermitService.insertTSpecialWorkPermit(tSpecialWorkPermit) > 0 ? AjaxResult.success(tSpecialWorkPermit) : AjaxResult.error();
     }
 
     /**

danger-manage-admin/src/main/java/com/zehong/web/controller/workPermit/TSpecialWorkPermitSignController.java

+package com.zehong.web.controller.workPermit;
+
+import java.util.List;
+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.TSpecialWorkPermitSign;
+import com.zehong.system.service.ITSpecialWorkPermitSignService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author zehong
+ * @date 2022-10-17
+ */
+@RestController
+@RequestMapping("/workPermit/sign")
+public class TSpecialWorkPermitSignController extends BaseController
+{
+    @Autowired
+    private ITSpecialWorkPermitSignService tSpecialWorkPermitSignService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        startPage();
+        List<TSpecialWorkPermitSign> list = tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignList(tSpecialWorkPermitSign);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        List<TSpecialWorkPermitSign> list = tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignList(tSpecialWorkPermitSign);
+        ExcelUtil<TSpecialWorkPermitSign> util = new ExcelUtil<TSpecialWorkPermitSign>(TSpecialWorkPermitSign.class);
+        return util.exportExcel(list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:query')")
+    @GetMapping(value = "/{signId}")
+    public AjaxResult getInfo(@PathVariable("signId") Long signId)
+    {
+        return AjaxResult.success(tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignById(signId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        return toAjax(tSpecialWorkPermitSignService.insertTSpecialWorkPermitSign(tSpecialWorkPermitSign));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        return toAjax(tSpecialWorkPermitSignService.updateTSpecialWorkPermitSign(tSpecialWorkPermitSign));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{signIds}")
+    public AjaxResult remove(@PathVariable Long[] signIds)
+    {
+        return toAjax(tSpecialWorkPermitSignService.deleteTSpecialWorkPermitSignByIds(signIds));
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/controller/workPermit/TWorkPermitController.java

 package com.zehong.web.controller.workPermit;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.github.pagehelper.util.StringUtil;
-import com.zehong.common.core.domain.model.LoginUser;
-import com.zehong.common.utils.SecurityUtils;
-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.core.domain.model.LoginUser;
+import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TWorkPermit;
 import com.zehong.system.service.ITWorkPermitService;
-import com.zehong.common.utils.poi.ExcelUtil;
-import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 作业许可证Controller
@@ -46,7 +37,7 @@ public class TWorkPermitController extends BaseController
     {
         startPage();
         List<TWorkPermit> list = tWorkPermitService.selectTWorkPermitList(tWorkPermit);
-        setOperator(list);
+        //setOperator(list);
         return getDataTable(list);
     }
 

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

+package com.zehong.system.domain;
+
+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_special_work_permit_sign
+ * 
+ * @author zehong
+ * @date 2022-10-17
+ */
+public class TSpecialWorkPermitSign extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long signId;
+
+    /** 作业证id */
+    @Excel(name = "作业证id")
+    private Long permitId;
+
+    /** 签名人id */
+    @Excel(name = "签名人id")
+    private Long staffId;
+
+    /** 签名人类型 */
+    @Excel(name = "签名人类型")
+    private String staffType;
+
+    /** 签名img */
+    @Excel(name = "签名img")
+    private String signName;
+
+    /** 意见 */
+    @Excel(name = "意见")
+    private String opinion;
+
+    /** 年-月-日-时-分 */
+    @Excel(name = "年-月-日-时-分")
+    private String signDate;
+
+    public void setSignId(Long signId) 
+    {
+        this.signId = signId;
+    }
+
+    public Long getSignId() 
+    {
+        return signId;
+    }
+    public void setPermitId(Long permitId) 
+    {
+        this.permitId = permitId;
+    }
+
+    public Long getPermitId() 
+    {
+        return permitId;
+    }
+    public void setStaffId(Long staffId) 
+    {
+        this.staffId = staffId;
+    }
+
+    public Long getStaffId() 
+    {
+        return staffId;
+    }
+    public void setStaffType(String staffType) 
+    {
+        this.staffType = staffType;
+    }
+
+    public String getStaffType() 
+    {
+        return staffType;
+    }
+    public void setSignName(String signName) 
+    {
+        this.signName = signName;
+    }
+
+    public String getSignName() 
+    {
+        return signName;
+    }
+    public void setOpinion(String opinion) 
+    {
+        this.opinion = opinion;
+    }
+
+    public String getOpinion() 
+    {
+        return opinion;
+    }
+    public void setSignDate(String signDate) 
+    {
+        this.signDate = signDate;
+    }
+
+    public String getSignDate() 
+    {
+        return signDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("signId", getSignId())
+            .append("permitId", getPermitId())
+            .append("staffId", getStaffId())
+            .append("staffType", getStaffType())
+            .append("signName", getSignName())
+            .append("opinion", getOpinion())
+            .append("signDate", getSignDate())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TSpecialWorkPermitSign;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-10-17
+ */
+public interface TSpecialWorkPermitSignMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public TSpecialWorkPermitSign selectTSpecialWorkPermitSignById(Long signId);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<TSpecialWorkPermitSign> selectTSpecialWorkPermitSignList(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteTSpecialWorkPermitSignById(Long signId);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param signIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTSpecialWorkPermitSignByIds(Long[] signIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TSpecialWorkPermitSign;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author zehong
+ * @date 2022-10-17
+ */
+public interface ITSpecialWorkPermitSignService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public TSpecialWorkPermitSign selectTSpecialWorkPermitSignById(Long signId);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<TSpecialWorkPermitSign> selectTSpecialWorkPermitSignList(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param signIds 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteTSpecialWorkPermitSignByIds(Long[] signIds);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteTSpecialWorkPermitSignById(Long signId);
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TSpecialWorkPermitSignMapper;
+import com.zehong.system.domain.TSpecialWorkPermitSign;
+import com.zehong.system.service.ITSpecialWorkPermitSignService;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-10-17
+ */
+@Service
+public class TSpecialWorkPermitSignServiceImpl implements ITSpecialWorkPermitSignService 
+{
+    @Autowired
+    private TSpecialWorkPermitSignMapper tSpecialWorkPermitSignMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public TSpecialWorkPermitSign selectTSpecialWorkPermitSignById(Long signId)
+    {
+        return tSpecialWorkPermitSignMapper.selectTSpecialWorkPermitSignById(signId);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<TSpecialWorkPermitSign> selectTSpecialWorkPermitSignList(TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        return tSpecialWorkPermitSignMapper.selectTSpecialWorkPermitSignList(tSpecialWorkPermitSign);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        tSpecialWorkPermitSign.setCreateTime(DateUtils.getNowDate());
+        return tSpecialWorkPermitSignMapper.insertTSpecialWorkPermitSign(tSpecialWorkPermitSign);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tSpecialWorkPermitSign 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateTSpecialWorkPermitSign(TSpecialWorkPermitSign tSpecialWorkPermitSign)
+    {
+        return tSpecialWorkPermitSignMapper.updateTSpecialWorkPermitSign(tSpecialWorkPermitSign);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param signIds 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSpecialWorkPermitSignByIds(Long[] signIds)
+    {
+        return tSpecialWorkPermitSignMapper.deleteTSpecialWorkPermitSignByIds(signIds);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param signId 【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSpecialWorkPermitSignById(Long signId)
+    {
+        return tSpecialWorkPermitSignMapper.deleteTSpecialWorkPermitSignById(signId);
+    }
+}

danger-manage-system/src/main/resources/mapper/system/TSpecialWorkPermitSignMapper.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.TSpecialWorkPermitSignMapper">
+    
+    <resultMap type="TSpecialWorkPermitSign" id="TSpecialWorkPermitSignResult">
+        <result property="signId"    column="sign_id"    />
+        <result property="permitId"    column="permit_id"    />
+        <result property="staffId"    column="staff_id"    />
+        <result property="staffType"    column="staff_type"    />
+        <result property="signName"    column="sign_name"    />
+        <result property="opinion"    column="opinion"    />
+        <result property="signDate"    column="sign_date"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTSpecialWorkPermitSignVo">
+        select sign_id, permit_id, staff_id, staff_type, sign_name, opinion, sign_date, create_time from t_special_work_permit_sign
+    </sql>
+
+    <select id="selectTSpecialWorkPermitSignList" parameterType="TSpecialWorkPermitSign" resultMap="TSpecialWorkPermitSignResult">
+        <include refid="selectTSpecialWorkPermitSignVo"/>
+        <where>  
+            <if test="permitId != null "> and permit_id = #{permitId}</if>
+            <if test="staffId != null "> and staff_id = #{staffId}</if>
+            <if test="staffType != null  and staffType != ''"> and staff_type = #{staffType}</if>
+            <if test="signName != null  and signName != ''"> and sign_name like concat('%', #{signName}, '%')</if>
+            <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
+            <if test="signDate != null  and signDate != ''"> and sign_date = #{signDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectTSpecialWorkPermitSignById" parameterType="Long" resultMap="TSpecialWorkPermitSignResult">
+        <include refid="selectTSpecialWorkPermitSignVo"/>
+        where sign_id = #{signId}
+    </select>
+        
+    <insert id="insertTSpecialWorkPermitSign" parameterType="TSpecialWorkPermitSign">
+        insert into t_special_work_permit_sign
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="signId != null">sign_id,</if>
+            <if test="permitId != null">permit_id,</if>
+            <if test="staffId != null">staff_id,</if>
+            <if test="staffType != null">staff_type,</if>
+            <if test="signName != null">sign_name,</if>
+            <if test="opinion != null">opinion,</if>
+            <if test="signDate != null">sign_date,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="signId != null">#{signId},</if>
+            <if test="permitId != null">#{permitId},</if>
+            <if test="staffId != null">#{staffId},</if>
+            <if test="staffType != null">#{staffType},</if>
+            <if test="signName != null">#{signName},</if>
+            <if test="opinion != null">#{opinion},</if>
+            <if test="signDate != null">#{signDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTSpecialWorkPermitSign" parameterType="TSpecialWorkPermitSign">
+        update t_special_work_permit_sign
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="permitId != null">permit_id = #{permitId},</if>
+            <if test="staffId != null">staff_id = #{staffId},</if>
+            <if test="staffType != null">staff_type = #{staffType},</if>
+            <if test="signName != null">sign_name = #{signName},</if>
+            <if test="opinion != null">opinion = #{opinion},</if>
+            <if test="signDate != null">sign_date = #{signDate},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where sign_id = #{signId}
+    </update>
+
+    <delete id="deleteTSpecialWorkPermitSignById" parameterType="Long">
+        delete from t_special_work_permit_sign where sign_id = #{signId}
+    </delete>
+
+    <delete id="deleteTSpecialWorkPermitSignByIds" parameterType="String">
+        delete from t_special_work_permit_sign where sign_id in 
+        <foreach item="signId" collection="array" open="(" separator="," close=")">
+            #{signId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

danger-manage-web/src/api/workPermit/workPermitSign.js

+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function listSign(query) {
+  return request({
+    url: '/workPermit/sign/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function getSign(signId) {
+  return request({
+    url: '/workPermit/sign/' + signId,
+    method: 'get'
+  })
+}
+
+// 新增【请填写功能名称】
+export function addSign(data) {
+  return request({
+    url: '/workPermit/sign',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改【请填写功能名称】
+export function updateSign(data) {
+  return request({
+    url: '/workPermit/sign',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delSign(signId) {
+  return request({
+    url: '/workPermit/sign/' + signId,
+    method: 'delete'
+  })
+}
+
+// 导出【请填写功能名称】
+export function exportSign(query) {
+  return request({
+    url: '/workPermit/sign/export',
+    method: 'get',
+    params: query
+  })
+}