代码优化

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserHolidayController.java

@@ -79,7 +79,11 @@ public class CurrentRiskUserHolidayController extends BaseController
     public AjaxResult add(@RequestBody CurrentRiskUserHoliday currentRiskUserHoliday)
     {
         if(null == currentRiskUserHoliday.getId()){
+            currentRiskUserHoliday.setApplyUserId(getUserId());
             currentRiskUserHoliday.setApplyTime(new Date());
+            currentRiskUserHoliday.setStatus("0");
+            //查询上级项目经理
+
             currentRiskUserHolidayService.insertCurrentRiskUserHoliday(currentRiskUserHoliday);
         }else{
             currentRiskUserHoliday.setApproveTime(new Date());

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserPatrolController.java

@@ -28,7 +28,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-12-05
  */
 @RestController
-@RequestMapping("/risk/riskUserPatrol")
+@RequestMapping(value={"/risk/riskUserPatrol","/app-api/risk/riskUserPatrol"})
 public class CurrentRiskUserPatrolController extends BaseController
 {
     @Autowired
@@ -37,7 +37,6 @@ public class CurrentRiskUserPatrolController extends BaseController
     /**
      * 查询巡查执行管理列表
      */
-    @PreAuthorize("@ss.hasPermi('risk:riskUserPatrol:list')")
     @GetMapping("/list")
     public TableDataInfo list(CurrentRiskUserPatrol currentRiskUserPatrol)
     {

censoft-rongtong/src/main/resources/mapper/system/CurrentRiskUserHolidayMapper.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.censoft.censoftrongtong.mapper.CurrentRiskUserHolidayMapper">
+    
+    <resultMap type="com.censoft.censoftrongtong.domain.CurrentRiskUserHoliday" id="CurrentRiskUserHolidayResult">
+        <result property="id"    column="id"    />
+        <result property="applyUserId"    column="apply_user_id"    />
+        <result property="approveUserId"    column="approve_user_id"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="approveTime"    column="approve_time"    />
+        <result property="holidayTime"    column="holiday_time"    />
+        <result property="reason"    column="reason"    />
+        <result property="approveMsg"    column="approve_msg"    />
+        <result property="status"    column="status"    />
+        <result property="sortNum"    column="sort_num"    />
+        <result property="delFlag"    column="del_flag"    />
+        <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="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCurrentRiskUserHolidayVo">
+        select id, apply_user_id, approve_user_id, apply_time, approve_time, holiday_time, reason, approve_msg, status, sort_num, del_flag, create_by, create_time, update_by, update_time, remark from current_risk_user_holiday
+    </sql>
+
+    <select id="selectCurrentRiskUserHolidayList" parameterType="com.censoft.censoftrongtong.domain.CurrentRiskUserHoliday" resultMap="CurrentRiskUserHolidayResult">
+        <include refid="selectCurrentRiskUserHolidayVo"/>
+        <where>  
+            <if test="applyUserId != null "> and apply_user_id = #{applyUserId}</if>
+            <if test="approveUserId != null "> and approve_user_id = #{approveUserId}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="approveTime != null "> and approve_time = #{approveTime}</if>
+            <if test="holidayTime != null "> and holiday_time = #{holidayTime}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="approveMsg != null  and approveMsg != ''"> and approve_msg = #{approveMsg}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="sortNum != null "> and sort_num = #{sortNum}</if>
+        </where>
+    </select>
+    
+    <select id="selectCurrentRiskUserHolidayById" parameterType="Long" resultMap="CurrentRiskUserHolidayResult">
+        <include refid="selectCurrentRiskUserHolidayVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCurrentRiskUserHoliday" parameterType="com.censoft.censoftrongtong.domain.CurrentRiskUserHoliday" useGeneratedKeys="true" keyProperty="id">
+        insert into current_risk_user_holiday
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyUserId != null">apply_user_id,</if>
+            <if test="approveUserId != null">approve_user_id,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="holidayTime != null">holiday_time,</if>
+            <if test="reason != null">reason,</if>
+            <if test="approveMsg != null">approve_msg,</if>
+            <if test="status != null">status,</if>
+            <if test="sortNum != null">sort_num,</if>
+            <if test="delFlag != null">del_flag,</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="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyUserId != null">#{applyUserId},</if>
+            <if test="approveUserId != null">#{approveUserId},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="holidayTime != null">#{holidayTime},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="approveMsg != null">#{approveMsg},</if>
+            <if test="status != null">#{status},</if>
+            <if test="sortNum != null">#{sortNum},</if>
+            <if test="delFlag != null">#{delFlag},</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="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCurrentRiskUserHoliday" parameterType="com.censoft.censoftrongtong.domain.CurrentRiskUserHoliday">
+        update current_risk_user_holiday
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyUserId != null">apply_user_id = #{applyUserId},</if>
+            <if test="approveUserId != null">approve_user_id = #{approveUserId},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="holidayTime != null">holiday_time = #{holidayTime},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="approveMsg != null">approve_msg = #{approveMsg},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="sortNum != null">sort_num = #{sortNum},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</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="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCurrentRiskUserHolidayById" parameterType="Long">
+        delete from current_risk_user_holiday where id = #{id}
+    </delete>
+
+    <delete id="deleteCurrentRiskUserHolidayByIds" parameterType="String">
+        delete from current_risk_user_holiday where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file