feat:编码规范性修改

kingbase
wangxy 10 months ago
parent 68af66d502
commit 2ca945c225

@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Objects;
@Controller @Controller
@RequestMapping("/system/checkresult") @RequestMapping("/system/checkresult")
@ -115,9 +116,12 @@ public class TdCheckResultController extends BaseController {
@ResponseBody @ResponseBody
public AjaxResult selfcheckSave(TdCheck tdCheck) public AjaxResult selfcheckSave(TdCheck tdCheck)
{ {
if (tdCheck.getCheckresult1().equals("0")&&tdCheck.getCheckresult2().equals("0") if (Objects.equals(tdCheck.getCheckresult1(),"0")
&&tdCheck.getCheckresult3().equals("0")&&tdCheck.getCheckresult4().equals("0") && Objects.equals(tdCheck.getCheckresult2(),"0")
&&tdCheck.getCheckresult5().equals("0")&&tdCheck.getCheckresult6().equals("0")){ && Objects.equals(tdCheck.getCheckresult3(),"0")
&& Objects.equals(tdCheck.getCheckresult4(),"0")
&& Objects.equals(tdCheck.getCheckresult5(),"0")
&& Objects.equals(tdCheck.getCheckresult6(),"0")){
tdCheck.setCheckState("0"); tdCheck.setCheckState("0");
}else { }else {
tdCheck.setCheckState("1"); tdCheck.setCheckState("1");

@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system.filemanager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import com.ruoyi.system.domain.TdFileProvide; import com.ruoyi.system.domain.TdFileProvide;
import com.ruoyi.system.domain.TdFileReceive; import com.ruoyi.system.domain.TdFileReceive;
@ -58,7 +59,7 @@ public class TdFileDestoryController extends BaseController
List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
List<TdFileReceive> tdFileReceives = new ArrayList<>(); List<TdFileReceive> tdFileReceives = new ArrayList<>();
for (TdFileReceive FileReceivelist : list){ for (TdFileReceive FileReceivelist : list){
if (FileReceivelist.getExtractState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){ if (Objects.equals(FileReceivelist.getExtractState(),"1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
tdFileReceives.add(FileReceivelist); tdFileReceives.add(FileReceivelist);
} }
} }

@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* Controller * Controller
@ -49,7 +50,7 @@ public class TdFileExtractController extends BaseController {
List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
List<TdFileReceive> tdFileReceives = new ArrayList<>(); List<TdFileReceive> tdFileReceives = new ArrayList<>();
for (TdFileReceive FileReceivelist : list){ for (TdFileReceive FileReceivelist : list){
if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){ if (Objects.equals(FileReceivelist.getReceiveState(),"1") && FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){
tdFileReceives.add(FileReceivelist); tdFileReceives.add(FileReceivelist);
} }
} }

@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system.system; package com.ruoyi.web.controller.system.system;
import java.util.List; import java.util.List;
import java.util.Objects;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
@ -145,7 +146,7 @@ public class TdLeaveController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult examinesave(TdLeave tdLeave) public AjaxResult examinesave(TdLeave tdLeave)
{ {
if (tdLeave.getLeavestate().equals("1")){ if (Objects.equals(tdLeave.getLeavestate(),"1")){
SysUser sysUser = userService.selectUserById(tdLeave.getUserId()); SysUser sysUser = userService.selectUserById(tdLeave.getUserId());
sysUser.setStatus("1"); sysUser.setStatus("1");
userService.updateUser(sysUser); userService.updateUser(sysUser);

Loading…
Cancel
Save