sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:5df7e474670a561d4bde7802d3cbcfd58cf7f23c
Branches Tags
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
...
compare: sxyanzhu:10b6f703760a88871a5c5ab0684b5c65f4387f6e
Branches Tags
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

2 Commits
5df7e47467 ... 10b6f70376

Author SHA1 Message Date
姜玉琦 10b6f70376 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-08-18 00:37:13 +08:00
姜玉琦 8a8b1519f1 提交代码 2023-08-18 00:37:07 +08:00
4 changed files with 10 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
View File

@ -30,10 +30,10 @@ public class BgWorkTrainController extends BaseController {
public TableDataInfo getWorkTrainList(String trainType,String deptId,String projectId){
WorkTrain workTrain = new WorkTrain();
workTrain.setTrainType(trainType);
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
if(deptId!=null && !"0".equals(deptId)){
workTrain.setNowDept(deptId);
}
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
workTrain.setProjectId(Convert.toLong(projectId));
}
return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain));

8
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
View File

@ -38,10 +38,10 @@ public class ProjectAttendanceController extends BaseController {
@GetMapping("/getDeptWorksList")
public TableDataInfo getDeptWorksList(String deptId,String projectId){
SurProjectDeptWroks surProjectDeptWroks = new SurProjectDeptWroks();
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
if(deptId!=null && !"0".equals(deptId)){
surProjectDeptWroks.setDeptId(Convert.toLong(deptId));
}
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
surProjectDeptWroks.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectDeptWroksService.selectBgscreenDeptWroksList(surProjectDeptWroks));
@ -57,10 +57,10 @@ public class ProjectAttendanceController extends BaseController {
@GetMapping("/getWorkAttendanceList")
public TableDataInfo getWorkAttendanceList(String deptId,String projectId,String date){
SurProjectWorkAttendance surProjectWorkAttendance = new SurProjectWorkAttendance();
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
if(deptId!=null && !"0".equals(deptId)){
surProjectWorkAttendance.setDeptId(Convert.toLong(deptId));
}
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
surProjectWorkAttendance.setProjectId(Convert.toLong(projectId));
}
if(StringUtils.isNotBlank(date)){

4
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java
View File

@ -30,10 +30,10 @@ public class ProjectInsuranceController extends BaseController {
@GetMapping("/getProjectInsuranceList")
public TableDataInfo getProjectInsuranceList(String deptId,String projectId){
SurProjectInsurance surProjectInsurance = new SurProjectInsurance();
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
if(deptId!=null && !"0".equals(deptId)){
surProjectInsurance.setNowDept(deptId);
}
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
surProjectInsurance.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance));

4
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java
View File

@ -31,10 +31,10 @@ public class ProjectSpecialController extends BaseController {
@GetMapping("/getProjectSpecialView")
public TableDataInfo getProjectSpecialView(String deptId,String projectId){
SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial();
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
if(deptId!=null && !"0".equals(deptId)){
surProjectWorkSpecial.setNowDept(deptId);
}
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
surProjectWorkSpecial.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial));