问题项修改

qushaowei

2023-11-18 9d3675b12829de9ec46c210c5c8c460705206dbc

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java

@@ -127,6 +127,8 @@
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandardService.save(dailyInspectionStandard);
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
        DailyInspectionStandardDetail isd = null;
@@ -153,6 +155,7 @@
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> edit(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        dailyInspectionStandard.setApprovalStatus("1");
        dailyInspectionStandardService.updateById(dailyInspectionStandard);
        //1.删除原点检项目
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
@@ -448,8 +451,17 @@
    @PostMapping(value = "/revise")
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandard.setId("");
        dailyInspectionStandard.setApprovalStatus("1");
        dailyInspectionStandard.setCreateTime(new Date());
        dailyInspectionStandard.setTakeEffectTime(null);
        dailyInspectionStandard.setLoseEfficacyTime(null);
        dailyInspectionStandard.setApprovalFeedback(null);
        dailyInspectionStandard.setAuditFeedback(null);
        dailyInspectionStandard.setAuditPerson(null);
        dailyInspectionStandard.setApprovalPerson(null);
        dailyInspectionStandardService.save(dailyInspectionStandard);
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
        DailyInspectionStandardDetail isd = null;
@@ -492,15 +504,18 @@
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> versionTakeEffect(@RequestBody DailyInspectionStandard dailyInspectionStandard) {

        List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
                .eq(DailyInspectionStandard::getVersionStatus, "2").list();
        for (DailyInspectionStandard standard : dailyInspectionStandards) {
            standard.setVersionStatus("3");
            standard.setLoseEfficacyTime(new Date());
            dailyInspectionStandardService.updateById(standard);
        }
        dailyInspectionStandard.setTakeEffectTime(new Date());
//        List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
//                .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
//                .eq(DailyInspectionStandard::getVersionStatus, "2").list();
//        for (DailyInspectionStandard standard : dailyInspectionStandards) {
//            standard.setVersionStatus("3");
//            standard.setLoseEfficacyTime(new Date());
//            dailyInspectionStandardService.updateById(standard);
//        }
//        dailyInspectionStandard.setTakeEffectTime(new Date());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
        dailyInspectionStandard.setLoseEfficacyTime(new Date());
        boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
        if (b){
            return Result.OK("编辑成功!");
@@ -509,5 +524,36 @@
        }
    }


    /**
     * 签审流程
     * qsw 2023-11-16
     */
    @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> auditApproval(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String approvalStatus = dailyInspectionStandard.getApprovalStatus();
        if("5".equals(approvalStatus)){//审核通过后，版本生效
            List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                    .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
                    .eq(DailyInspectionStandard::getVersionStatus, "2").list();
            for (DailyInspectionStandard standard : dailyInspectionStandards) {
                standard.setVersionStatus("3");
                standard.setLoseEfficacyTime(new Date());
                standard.setLoseEfficacyPerson(sysUser.getRealname());
                dailyInspectionStandardService.updateById(standard);
            }
            dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
            dailyInspectionStandard.setVersionStatus("2");
            dailyInspectionStandard.setTakeEffectTime(new Date());
        }else if("3".equals(approvalStatus)){
            dailyInspectionStandard.setAuditPerson(sysUser.getRealname());
        }
        boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
        if (b){
            return Result.OK("审核成功!");
        }else{
            return Result.error("审核失败!");
        }
    }
}