Commit e4cc4f12 authored by dlkong's avatar dlkong
Browse files

风险巡查

parent ba596420

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ public class CurrentRiskPostController extends BaseController 
     */

     */

    @PreAuthorize("@ss.hasPermi('system:currentRiskPost:add')")

    @PreAuthorize("@ss.hasPermi('system:currentRiskPost:add')")

    @Log(title = "现状风险岗位", businessType = BusinessType.INSERT)

    @Log(title = "现状风险岗位", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping("save")

    public AjaxResult add(@RequestBody CurrentRiskPost currentRiskPost)

    public AjaxResult add(@RequestBody CurrentRiskPost currentRiskPost)

    {

    {

        if(currentRiskPost.getId() == null){

        if(currentRiskPost.getId() == null){

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

+11 −3
Original line number Original line Diff line number Diff line 
package com.censoft.censoftrongtong.controller;

package com.censoft.censoftrongtong.controller;





import java.util.Date;

import java.util.List;

import java.util.List;

import javax.servlet.http.HttpServletResponse;

import javax.servlet.http.HttpServletResponse;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.security.access.prepost.PreAuthorize;
@@ -28,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo; 
 * @date 2023-12-05

 * @date 2023-12-05

 */

 */

@RestController

@RestController

@RequestMapping("/risk/currentRiskHoliday")

@RequestMapping(value = {"/risk/currentRiskHoliday","/app-api/risk/currentRiskHoliday"})

public class CurrentRiskUserHolidayController extends BaseController

public class CurrentRiskUserHolidayController extends BaseController

{

{

    @Autowired

    @Autowired
@@ -74,10 +75,17 @@ public class CurrentRiskUserHolidayController extends BaseController 
     */

     */

    @PreAuthorize("@ss.hasPermi('risk:currentRiskHoliday:add')")

    @PreAuthorize("@ss.hasPermi('risk:currentRiskHoliday:add')")

    @Log(title = "现状风险巡查用户请假", businessType = BusinessType.INSERT)

    @Log(title = "现状风险巡查用户请假", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping("/save")

    public AjaxResult add(@RequestBody CurrentRiskUserHoliday currentRiskUserHoliday)

    public AjaxResult add(@RequestBody CurrentRiskUserHoliday currentRiskUserHoliday)

    {

    {

        return toAjax(currentRiskUserHolidayService.insertCurrentRiskUserHoliday(currentRiskUserHoliday));

        if(null == currentRiskUserHoliday.getId()){

            currentRiskUserHoliday.setApplyTime(new Date());

            currentRiskUserHolidayService.insertCurrentRiskUserHoliday(currentRiskUserHoliday);

        }else{

            currentRiskUserHoliday.setApproveTime(new Date());

            currentRiskUserHolidayService.updateCurrentRiskUserHoliday(currentRiskUserHoliday);

        }

        return AjaxResult.success();

    }

    }





    /**

    /**

censoft-rongtong/src/main/resources/mapper/system/CurrentRiskPostMapper.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ 
            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>

            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>

            <if test="sortNum != null ">and sort_num = #{sortNum}</if>

            <if test="sortNum != null ">and sort_num = #{sortNum}</if>

        </where>

        </where>

        group by a.id

    </select>

    </select>





    <select id="selectCurrentRiskPostById" parameterType="Long" resultMap="CurrentRiskPostResult">

    <select id="selectCurrentRiskPostById" parameterType="Long" resultMap="CurrentRiskPostResult">

censoft-rongtong/src/main/resources/mapper/system/ProjectUserPostMapper.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
        LEFT JOIN sys_user c on a.user_id = c.user_id

        LEFT JOIN sys_user c on a.user_id = c.user_id

        <where>  

        <where>  

            <if test="projectId != null "> and project_id = #{projectId}</if>

            <if test="projectId != null "> and project_id = #{projectId}</if>

            <if test="userId != null "> and user_id = #{userId}</if>

            <if test="userId != null "> and a.user_id = #{userId}</if>

            <if test="postId != null "> and post_id = #{postId}</if>

            <if test="postId != null "> and post_id = #{postId}</if>

            <if test="projectName != null "> and b.`name` like concat('%',#{projectName},'%')</if>

            <if test="projectName != null "> and b.`name` like concat('%',#{projectName},'%')</if>

        </where>

        </where>