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

提交代码

dev_xds
姜玉琦 2024-01-21 22:47:43 +08:00
parent 64b66015aa
commit f845d6e42f
17 changed files with 180 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
View File

@ -149,7 +149,7 @@ public class LabourApiController extends BaseController {
if(req.getDataSign(sysApplyConfig.getPrivateKey())){
try {
SurProjectAttendanceGroup surProjectAttendanceGroup = JSONObject.parseObject(req.getData(), SurProjectAttendanceGroup.class);
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId())){
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId()) && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyName()) && StringUtils.isNotEmpty(surProjectAttendanceGroup.getName())){
// 查询当前班组是否已推送
SurProjectAttendanceGroup searchModel = new SurProjectAttendanceGroup();
searchModel.setAppId(sysApplyConfig.getAppId());
@ -214,7 +214,7 @@ public class LabourApiController extends BaseController {
surProjectAttendanceGroupService.deleteSurProjectAttendanceGroupByParams(params);
for(int i=0;i<surProjectAttendanceGroupList.size();i++){
SurProjectAttendanceGroup surProjectAttendanceGroup = surProjectAttendanceGroupList.get(i);
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId())){
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId()) && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyName()) && StringUtils.isNotEmpty(surProjectAttendanceGroup.getName())){
surProjectAttendanceGroup.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceGroup.setCreateBy(sysApplyConfig.getAppId());
@ -256,7 +256,8 @@ public class LabourApiController extends BaseController {
if(req.getDataSign(sysApplyConfig.getPrivateKey())){
try {
SurProjectAttendanceUser surProjectAttendanceUser = JSONObject.parseObject(req.getData(), SurProjectAttendanceUser.class);
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null){
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getName()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null
&& StringUtils.isNotEmpty(surProjectAttendanceUser.getGroupName()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkTypeName()) && surProjectAttendanceUser.getGender()!=null && StringUtils.isNotEmpty(surProjectAttendanceUser.getRecentPhoto()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getNativePlace()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getEnterDate()) && surProjectAttendanceUser.getState()!=null){
// 查询当前人员是否已推送
SurProjectAttendanceUser searchModel = new SurProjectAttendanceUser();
searchModel.setAppId(sysApplyConfig.getAppId());
@ -321,8 +322,8 @@ public class LabourApiController extends BaseController {
surProjectAttendanceUserService.deleteSurProjectAttendanceUserByParams(params);
for(int i=0;i<surProjectAttendanceUserList.size();i++){
SurProjectAttendanceUser surProjectAttendanceUser = surProjectAttendanceUserList.get(i);
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null){
surProjectAttendanceUser.setAppId(sysApplyConfig.getAppId());
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getName()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null
&& StringUtils.isNotEmpty(surProjectAttendanceUser.getGroupName()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkTypeName()) && surProjectAttendanceUser.getGender()!=null && StringUtils.isNotEmpty(surProjectAttendanceUser.getRecentPhoto()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getNativePlace()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getEnterDate()) && surProjectAttendanceUser.getState()!=null){ surProjectAttendanceUser.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceUser.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCreateTime(new Date());

2
ruoyi-admin/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8091
port: 8088
servlet:
# 应用的访问路径
context-path: /jhapi

9
ruoyi-ui/src/api/project/projectChecking.js
View File

@ -44,6 +44,15 @@ export function updateProjectChecking(data) {
})
}
// 修改项目验收
export function updateProjectCheckingNoLog(data) {
return request({
url: '/project/projectChecking/editNoLog',
method: 'post',
data: data
})
}
// 删除项目验收
export function delProjectChecking(id) {
return request({

9
ruoyi-ui/src/api/work/workTrain.js
View File

@ -35,6 +35,15 @@ export function updateWorkTrain(data) {
})
}
// 修改演练培训
export function updateWorkTrainDataType(data) {
return request({
url: '/work/workTrain/editDataType',
method: 'post',
data: data
})
}
// 删除演练培训
export function delWorkTrain(id) {
return request({

60
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -46,7 +46,7 @@
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="queryParams.dataTypeLvl1 == dict.raw.cssClass"
v-if="queryParams.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -210,7 +210,8 @@
></el-image>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
v-if="!checkPermi(['project:surProject:projectSort'])"
label="验收类型"
align="center"
prop="dataTypeLvl1"
@ -226,6 +227,43 @@
:value="scope.row.dataTypeLvl2"
/>
</template>
</el-table-column> -->
<el-table-column
label="验收类型"
align="center"
width="180"
prop="dataTypeLvl1"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.dataTypeLvl1"
placeholder="请选择验收类型"
style="width: 100%"
@change="setDataTypeLvl1(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl1"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-select
v-model="scope.row.dataTypeLvl2"
v-show="scope.row.dataTypeLvl1"
placeholder="请选择类型分类"
style="width: 100%"
@change="setDataTypeLvl2(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="scope.row.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="验收工序部位"
@ -333,7 +371,7 @@
>处理审批</el-button
>
<el-button
v-if="findUpdateData(scope.row.approveStatus)"
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-edit"
@ -397,7 +435,7 @@
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="form.dataTypeLvl1 == dict.raw.cssClass"
v-if="form.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -504,6 +542,7 @@ import {
delProjectChecking,
addProjectChecking,
updateProjectChecking,
updateProjectCheckingNoLog,
findGroupCountByApprove,
} from "@/api/project/projectChecking";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -607,14 +646,11 @@ export default {
this.getList();
},
methods: {
findUpdateData(val) {
// this.$store.getters.userId==1
// val != "4"
if (true) {
return true;
} else {
return false;
}
setDataTypeLvl1(row, val){
updateProjectChecking({id:row.id,dataTypeLvl1:val});
},
setDataTypeLvl2(row, val){
updateProjectChecking({id:row.id,dataTypeLvl2:val});
},
getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg";

11
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -202,7 +202,7 @@
>审批日志</el-button
>
<el-button
v-if="findUpdateData(scope.row.approveStatus)"
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-edit"
@ -464,15 +464,6 @@ export default {
mounted() {},
methods: {
findUpdateData(val){
// this.$store.getters.userId==1
// val != '4'
if(true){
return true;
}else{
return false;
}
},
getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
},

2
ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
View File

@ -129,7 +129,6 @@
>下载文件</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-edit"
@ -138,7 +137,6 @@
>修改</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"

26
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -141,12 +141,22 @@
></el-image>
</template>
</el-table-column>
<el-table-column label="演练类型" align="center" prop="dataType">
<el-table-column label="培训类型" align="center" prop="dataType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.work_train_data_type"
:value="scope.row.dataType"
/>
<el-select
v-model="scope.row.dataType"
placeholder="请选择培训类型"
style="width: 100%"
@change="setDataType(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.work_train_data_type"
v-show="dict.raw.remark == '1'"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
@ -202,7 +212,6 @@
>下载文件</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-edit"
@ -211,7 +220,6 @@
>修改</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"
@ -333,6 +341,7 @@ import {
delWorkTrain,
addWorkTrain,
updateWorkTrain,
updateWorkTrainDataType,
listProjectUnit,
} from "@/api/work/emergencyDrill";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -414,6 +423,9 @@ export default {
});
},
methods: {
setDataType(row,val){
updateWorkTrainDataType({id:row.id,dataType:val});
},
getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
},

24
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -143,10 +143,20 @@
</el-table-column>
<el-table-column label="培训类型" align="center" prop="dataType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.work_train_data_type"
:value="scope.row.dataType"
/>
<el-select
v-model="scope.row.dataType"
placeholder="请选择培训类型"
style="width: 100%"
@change="setDataType(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.work_train_data_type"
v-show="dict.raw.remark == '0'"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
@ -202,7 +212,6 @@
>下载文件</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-edit"
@ -211,7 +220,6 @@
>修改</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"
@ -326,6 +334,7 @@ import {
delWorkTrain,
addWorkTrain,
updateWorkTrain,
updateWorkTrainDataType,
listProjectUnit,
} from "@/api/work/workTrain";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -407,6 +416,9 @@ export default {
});
},
methods: {
setDataType(row,val){
updateWorkTrainDataType({id:row.id,dataType:val});
},
getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
},

2
ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
View File

@ -129,7 +129,6 @@
>下载文件</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-edit"
@ -138,7 +137,6 @@
>修改</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"

11
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java
View File

@ -134,6 +134,17 @@ public class SurProjectCheckingController extends BaseController
return toAjax(surProjectCheckingService.updateSurProjectChecking(surProjectChecking));
}
/**
* 修改举牌验收
*/
@PreAuthorize("@ss.hasPermi('project:projectChecking:edit')")
@Log(title = "举牌验收", businessType = BusinessType.UPDATE)
@PostMapping("/editNoLog")
public AjaxResult editNoLog(@RequestBody SurProjectChecking surProjectChecking)
{
return toAjax(surProjectCheckingService.updateSurProjectCheckingNoLog(surProjectChecking));
}
/**
* 删除举牌验收
*/

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
View File

@ -69,6 +69,14 @@ public interface ISurProjectCheckingService
*/
public int updateSurProjectChecking(SurProjectChecking surProjectChecking);
/**
* 修改项目验收
*
* @param surProjectChecking 项目验收
* @return 结果
*/
public int updateSurProjectCheckingNoLog(SurProjectChecking surProjectChecking);
/**
* 批量删除项目验收
*

13
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
View File

@ -195,6 +195,19 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
return surProjectCheckingMapper.updateSurProjectChecking(surProjectChecking);
}
/**
* 修改项目验收
*
* @param surProjectChecking 项目验收
* @return 结果
*/
@Override
@Transactional
public int updateSurProjectCheckingNoLog(SurProjectChecking surProjectChecking)
{
return surProjectCheckingMapper.updateSurProjectChecking(surProjectChecking);
}
/**
* 批量删除项目验收
*

11
yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java
View File

@ -126,6 +126,17 @@ public class WorkTrainController extends BaseController
return toAjax(workTrainService.updateWorkTrain(workTrain));
}
/**
* 修改演练培训
*/
@PreAuthorize("@ss.hasPermi('work:workTrain:edit')")
@Log(title = "演练培训", businessType = BusinessType.UPDATE)
@PostMapping("/editDataType")
public AjaxResult editDataType(@RequestBody WorkTrain workTrain)
{
return toAjax(workTrainService.updateWorkTrainDataType(workTrain));
}
/**
* 删除演练培训
*/

6
yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
View File

@ -71,13 +71,13 @@ public class WorkTrain extends BaseEntity
private String trainFile;
/** 数据类型 */
private Integer dataType;
private String dataType;
public Integer getDataType() {
public String getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
public void setDataType(String dataType) {
this.dataType = dataType;
}

8
yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java
View File

@ -69,6 +69,14 @@ public interface IWorkTrainService
*/
public int updateWorkTrain(WorkTrain workTrain);
/**
* 修改演练培训
*
* @param workTrain 演练培训
* @return 结果
*/
public int updateWorkTrainDataType(WorkTrain workTrain);
/**
* 批量删除演练培训
*

17
yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java
View File

@ -102,8 +102,8 @@ public class WorkTrainServiceImpl implements IWorkTrainService
* @param workTrain 演练培训
* @return 结果
*/
@Transactional
@Override
@Transactional
public int insertWorkTrain(WorkTrain workTrain)
{
if(workTrain.getCreateBy()==null){
@ -122,8 +122,8 @@ public class WorkTrainServiceImpl implements IWorkTrainService
* @param workTrain 演练培训
* @return 结果
*/
@Transactional
@Override
@Transactional
public int updateWorkTrain(WorkTrain workTrain)
{
workTrain.setUpdateBy(SecurityUtils.getUsername());
@ -133,6 +133,19 @@ public class WorkTrainServiceImpl implements IWorkTrainService
return workTrainMapper.updateWorkTrain(workTrain);
}
/**
* 修改演练培训
*
* @param workTrain 演练培训
* @return 结果
*/
@Override
@Transactional
public int updateWorkTrainDataType(WorkTrain workTrain)
{
return workTrainMapper.updateWorkTrain(workTrain);
}
/**
* 批量删除演练培训
*