临时提交

16639036659

2023-10-24 24eb39a42ebe9f32ec401b10751a1611bfcfcf2e

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.poi.ExcelUtilByDangerLedger;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -23,9 +24,11 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPointExport;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import lombok.Data;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

@@ -33,10 +36,7 @@
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

/**
 * 隐患台账Controller
@@ -361,6 +361,7 @@
            } else if (("超期改").equals(rectifyStatusLedger)) {
                hiddenDangerCheckPoint.setStage("5");
                hiddenDangerCheckPoint.setOverdueRectify("1");
//                hiddenDangerCheckPoint.setAcceptStatus("1");
            }
        }
        //整改部门
@@ -635,6 +636,44 @@
        return getDataTable(list);
    }

    /**
     * 隐患核查--核查
     */
    @Log(title = "隐患核查--核查")
    @GetMapping("/editDangerLevel/{id}")
    public String editNextConfirm(@PathVariable("id") Long id, ModelMap mmap) {
        //隐患排查实体
        HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
        mmap.put("hdcp", hiddenDangerCheckPoint);

        return prefix + "/editDangerLevel";
    }

    /**
     * 隐患类别修改
     */
    @Log(title = "隐患上报", businessType = BusinessType.DELETE)
    @PostMapping("/editDangerLevelSave")
    @ResponseBody
    @Transactional
    public AjaxResult editDangerLevelSave(HiddenDangerCheckPoint hdcp) {
        if(ObjectUtils.isEmpty(hdcp.getId())){
            return AjaxResult.error("id不能为空");
        }
        if(ObjectUtils.isEmpty(hdcp.getTroubleshootTypeName())){
            return AjaxResult.error("隐患类别不能为空");
        }
        //获取当前更新用户信息
        User sysUser = getSysUser();
        hdcp.setUpdateBy(ShiroUtils.getLoginName());
        hdcp.setUpdateTime(DateUtils.getNowDate());
        int i = hiddenDangerCheckPointService.editDangerLevel(hdcp);
        if (i < 1){
            return AjaxResult.error("操作失败");
        }
        return AjaxResult.success();
    }

}