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

提交

dev_xds
姜玉琦 2023-08-18 00:18:03 +08:00
parent 116cc8a419
commit 46dc8626f3
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/project/surProjectSchedule/index.vue
View File

@ -200,7 +200,7 @@
/>
<el-table-column label="提交时间" align="left" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{s}") }}</span>
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}</span>
</template>
</el-table-column>
<el-table-column

2
ruoyi-ui/src/views/trouble/pshMarks/index.vue
View File

@ -94,7 +94,7 @@
<el-table-column label="项目名称" align="center" prop="marksLocation" width="200" show-overflow-tooltip/>
<el-table-column label="留痕时间" align="center" prop="marksTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.marksTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.marksTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="留痕图片" align="center" property="path" width="220">

2
ruoyi-ui/src/views/trouble/sspMarks/index.vue
View File

@ -94,7 +94,7 @@
<el-table-column label="项目名称" align="center" prop="marksLocation" width="200" show-overflow-tooltip/>
<el-table-column label="留痕时间" align="center" prop="marksTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.marksTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.marksTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="留痕图片" align="center" property="path" width="220">

2
ruoyi-ui/src/views/work/workFile/index.vue
View File

@ -118,7 +118,7 @@
<el-table-column label="上传用户" align="center" prop="createBy" />
<el-table-column label="上传时间" align="center" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />

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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
workTrain.setNowDept(deptId);
}
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"undefined".equals(projectId) && !"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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
surProjectDeptWroks.setDeptId(Convert.toLong(deptId));
}
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"undefined".equals(projectId) && !"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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
surProjectWorkAttendance.setDeptId(Convert.toLong(deptId));
}
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"undefined".equals(projectId) && !"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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
surProjectInsurance.setNowDept(deptId);
}
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
surProjectInsurance.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance));

6
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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){
if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){
surProjectWorkSpecial.setNowDept(deptId);
}
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){
surProjectWorkSpecial.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial));
@ -49,7 +49,7 @@ public class ProjectSpecialController extends BaseController {
public TableDataInfo getProjectSpecialList(String projectId){
SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial();
surProjectWorkSpecial.setIsDel(Convert.toInt(PublicStateEnum.OK.getCode()));
if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){
if(projectId!=null && !"0".equals(projectId)){
surProjectWorkSpecial.setProjectId(Convert.toLong(projectId));
}
return getDataTable(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial));