Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseWarehousecheckController.java

@@ -104,6 +104,9 @@ public class TWarehouseWarehousecheckController extends BaseController
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
+
+
+
         Integer father=tWarehouseWarehousecheckService.deleteTWarehouseWarehousecheckByIds(fIds);
 
         Integer child=itWarehouseWarehousecheckitemsService.deleteTWarehouseWarehousecheckitemsByIds(fIds);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseWarehousecheckitemsController.java

@@ -94,6 +94,8 @@ public class TWarehouseWarehousecheckitemsController extends BaseController
     /**
      * 删除巡检子
      */
+
+
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheckItems:remove')")
     @Log(title = "巡检子", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{fIds}")

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseWarehousecheck.java

@@ -17,6 +17,8 @@ public class TWarehouseWarehousecheck extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+
+
     /** 主键id */
     private Long fId;
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseWarehousecheckitems.java

@@ -136,6 +136,8 @@ public class TWarehouseWarehousecheckitems<DataTypeWithBLOBs> extends BaseEntity
         this.delFlag = delFlag;
     }
 
+
+
     @Override
     public String toString() {
         return "TWarehouseWarehousecheckitems{" +

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckMapper.java

@@ -19,6 +19,7 @@ public interface TWarehouseWarehousecheckMapper
      * @param fId 巡检主ID
      * @return 巡检主
      */
+
     public TWarehouseWarehousecheck selectTWarehouseWarehousecheckById(Long fId);
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckitemsMapper.java

@@ -58,5 +58,6 @@ public interface TWarehouseWarehousecheckitemsMapper
      * @param fIds 需要删除的数据ID
      * @return 结果
      */
+
     public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseWarehousecheckService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.warehouseBusiness.service;
+
+import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
+
+import java.util.List;
+
+/**
+ * 巡检主Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-27
+ */
+public interface ITWarehouseWarehousecheckService
+{
+    /**
+     * 查询巡检主
+     *
+     * @param fId 巡检主ID
+     * @return 巡检主
+     */
+    public TWarehouseWarehousecheck selectTWarehouseWarehousecheckById(Long fId);
+
+
+
+    /**
+     * 查询巡检主列表
+     *
+     * @param tWarehouseWarehousecheck 巡检主
+     * @return 巡检主集合
+     */
+    public List<TWarehouseWarehousecheck> selectTWarehouseWarehousecheckList(TWarehouseWarehousecheck tWarehouseWarehousecheck);
+
+    /**
+     * 新增巡检主
+     *
+     * @param tWarehouseWarehousecheck 巡检主
+     * @return 结果
+     */
+    public int insertTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
+
+    /**
+     * 修改巡检主
+     *
+     * @param tWarehouseWarehousecheck 巡检主
+     * @return 结果
+     */
+    public int updateTWarehouseWarehousecheck(TWarehouseWarehousecheck tWarehouseWarehousecheck);
+
+    /**
+     * 批量删除巡检主
+     *
+     * @param fIds 需要删除的巡检主ID
+     * @return 结果
+     */
+    public int deleteTWarehouseWarehousecheckByIds(Long[] fIds);
+
+    /**
+     * 删除巡检主信息
+     *
+     * @param fId 巡检主ID
+     * @return 结果
+     */
+    public int deleteTWarehouseWarehousecheckById(Long fId);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseWarehousecheckitemsService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.warehouseBusiness.service;
+
+import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
+
+import java.util.List;
+
+/**
+ * 巡检子Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-27
+ */
+public interface ITWarehouseWarehousecheckitemsService
+{
+
+
+    /**
+     * 查询巡检子
+     *
+     * @param fId 巡检子ID
+     * @return 巡检子
+     */
+    public TWarehouseWarehousecheckitems selectTWarehouseWarehousecheckitemsById(Long fId);
+
+    /**
+     * 查询巡检子列表
+     *
+     * @param tWarehouseWarehousecheckitems 巡检子
+     * @return 巡检子集合
+     */
+    public List<TWarehouseWarehousecheckitems> selectTWarehouseWarehousecheckitemsList(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
+
+    /**
+     * 新增巡检子
+     *
+     * @param tWarehouseWarehousecheckitems 巡检子
+     * @return 结果
+     */
+    public int insertTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
+
+    /**
+     * 修改巡检子
+     *
+     * @param tWarehouseWarehousecheckitems 巡检子
+     * @return 结果
+     */
+    public int updateTWarehouseWarehousecheckitems(TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems);
+
+    /**
+     * 批量删除巡检子
+     *
+     * @param fIds 需要删除的巡检子ID
+     * @return 结果
+     */
+    public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds);
+
+    /**
+     * 删除巡检子信息
+     *
+     * @param fId 巡检子ID
+     * @return 结果
+     */
+    public int deleteTWarehouseWarehousecheckitemsById(Long fId);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseWarehousecheckServiceImpl.java

@@ -17,6 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehousecheckService
 {
+
+
     @Autowired
     private TWarehouseWarehousecheckMapper tWarehouseWarehousecheckMapper;
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseWarehousecheckitemsServiceImpl.java

@@ -17,9 +17,11 @@ import org.springframework.stereotype.Service;;
 @Service
 public class TWarehouseWarehousecheckitemsServiceImpl implements ITWarehouseWarehousecheckitemsService
 {
+
     @Autowired
     private TWarehouseWarehousecheckitemsMapper tWarehouseWarehousecheckitemsMapper;
 
+
     /**
      * 查询巡检子
      *

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckMapper.xml

@@ -0,0 +1,107 @@
+<?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.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckMapper">
+
+    <resultMap type="TWarehouseWarehousecheck" id="TWarehouseWarehousecheckResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fWarehouseid"    column="f_warehouseid"    />
+        <result property="fWarehousename"    column="f_warehousename"    />
+        <result property="plannedDate"    column="planned_date"    />
+        <result property="inspectionDate"    column="inspection_date"    />
+        <result property="inspector"    column="inspector"    />
+        <result property="inspectionRemark"    column="inspection_remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseWarehousecheckVo">
+        select f_id, f_warehouseid, f_warehousename, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheck
+    </sql>
+
+    <select id="selectTWarehouseWarehousecheckList" parameterType="TWarehouseWarehousecheck" resultMap="TWarehouseWarehousecheckResult">
+        <include refid="selectTWarehouseWarehousecheckVo"/>
+        <where>
+            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
+            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
+            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
+            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
+            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
+            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
+        </where>
+    </select>
+
+
+    <select id="selectTWarehouseWarehousecheckById" parameterType="Long" resultMap="TWarehouseWarehousecheckResult">
+        <include refid="selectTWarehouseWarehousecheckVo"/>
+        where f_id = #{fId}
+    </select>
+
+    <insert id="insertTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_warehousecheck
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseid != null">f_warehouseid,</if>
+            <if test="fWarehousename != null">f_warehousename,</if>
+            <if test="plannedDate != null">planned_date,</if>
+            <if test="inspectionDate != null">inspection_date,</if>
+            <if test="inspector != null">inspector,</if>
+            <if test="inspectionRemark != null">inspection_remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fWarehouseid != null">#{fWarehouseid},</if>
+            <if test="fWarehousename != null">#{fWarehousename},</if>
+            <if test="plannedDate != null">#{plannedDate},</if>
+            <if test="inspectionDate != null">#{inspectionDate},</if>
+            <if test="inspector != null">#{inspector},</if>
+            <if test="inspectionRemark != null">#{inspectionRemark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTWarehouseWarehousecheck" parameterType="TWarehouseWarehousecheck">
+        update t_warehouse_warehousecheck
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
+            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
+            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
+            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
+            <if test="inspector != null">inspector = #{inspector},</if>
+            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseWarehousecheckById" parameterType="Long">
+        delete from t_warehouse_warehousecheck where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseWarehousecheckByIds" parameterType="String">
+        delete from t_warehouse_warehousecheck where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckitemsMapper.xml

@@ -0,0 +1,116 @@
+<?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.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper">
+    <resultMap type="TWarehouseWarehousecheckitems" id="TWarehouseWarehousecheckitemsResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fPid"    column="f_pid"    />
+        <result property="fWarehouseid"    column="f_warehouseid"    />
+        <result property="fWarehousename"    column="f_warehousename"    />
+        <result property="inspectionPhotos"    column="inspection_photos"    />
+        <result property="plannedDate"    column="planned_date"    />
+        <result property="inspectionDate"    column="inspection_date"    />
+        <result property="inspector"    column="inspector"    />
+        <result property="inspectionRemark"    column="inspection_remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTWarehouseWarehousecheckitemsVo">
+        select f_id, f_pid, f_warehouseid, f_warehousename, inspection_photos, planned_date, inspection_date, inspector, inspection_remark, create_by, create_time, update_by, update_time, del_flag, remark from t_warehouse_warehousecheckitems
+    </sql>
+
+    <select id="selectTWarehouseWarehousecheckitemsList" parameterType="TWarehouseWarehousecheckitems" resultMap="TWarehouseWarehousecheckitemsResult">
+        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
+        <where>
+            <if test="fPid != null "> and f_pid = #{fPid}</if>
+            <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
+            <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
+            <if test="inspectionPhotos != null  and inspectionPhotos != ''"> and inspection_photos = #{inspectionPhotos}</if>
+            <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
+            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
+            <if test="inspector != null  and inspector != ''"> and inspector = #{inspector}</if>
+            <if test="inspectionRemark != null  and inspectionRemark != ''"> and inspection_remark = #{inspectionRemark}</if>
+        </where>
+    </select>
+
+    <select id="selectTWarehouseWarehousecheckitemsById" parameterType="Long" resultMap="TWarehouseWarehousecheckitemsResult">
+        <include refid="selectTWarehouseWarehousecheckitemsVo"/>
+        where f_id = #{fId}
+    </select>
+
+    <insert id="insertTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehouse_warehousecheckitems
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">f_pid,</if>
+            <if test="fWarehouseid != null">f_warehouseid,</if>
+            <if test="fWarehousename != null">f_warehousename,</if>
+            <if test="inspectionPhotos != null">inspection_photos,</if>
+            <if test="plannedDate != null">planned_date,</if>
+            <if test="inspectionDate != null">inspection_date,</if>
+            <if test="inspector != null">inspector,</if>
+            <if test="inspectionRemark != null">inspection_remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">#{fPid},</if>
+            <if test="fWarehouseid != null">#{fWarehouseid},</if>
+            <if test="fWarehousename != null">#{fWarehousename},</if>
+            <if test="inspectionPhotos != null">#{inspectionPhotos},</if>
+            <if test="plannedDate != null">#{plannedDate},</if>
+            <if test="inspectionDate != null">#{inspectionDate},</if>
+            <if test="inspector != null">#{inspector},</if>
+            <if test="inspectionRemark != null">#{inspectionRemark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTWarehouseWarehousecheckitems" parameterType="TWarehouseWarehousecheckitems">
+        update t_warehouse_warehousecheckitems
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
+            <if test="fWarehousename != null">f_warehousename = #{fWarehousename},</if>
+            <if test="inspectionPhotos != null">inspection_photos = #{inspectionPhotos},</if>
+            <if test="plannedDate != null">planned_date = #{plannedDate},</if>
+            <if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
+            <if test="inspector != null">inspector = #{inspector},</if>
+            <if test="inspectionRemark != null">inspection_remark = #{inspectionRemark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTWarehouseWarehousecheckitemsById" parameterType="Long">
+        delete from t_warehouse_warehousecheckitems where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTWarehouseWarehousecheckitemsByIds" parameterType="String">
+        delete from t_warehouse_warehousecheckitems where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+
+</mapper>