Skip to content

A
amos-boot-biz
Commit d8e8913b authored by chenzhao's avatar chenzhao
Browse files
Options

修改bug

parent bf87e185
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 38 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java
View file @ d8e8913b
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
......@@ -22,7 +23,7 @@ public interface IMaintenanceCompanyService {
* @param maintenanceCompany
* @return
*/
public boolean saveCompanyDetail(MaintenanceCompany maintenanceCompany);
public MaintenanceCompany saveCompanyDetail(MaintenanceCompany maintenanceCompany);
/**
* 添加保存维保单位人员基本信息
......@@ -30,7 +31,7 @@ public interface IMaintenanceCompanyService {
* @param maintenanceCompany
* @return
*/
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany);
public MaintenanceCompany savePersonDetail(MaintenanceCompany maintenanceCompany);
/**
* 自定义假删除
......@@ -53,7 +54,7 @@ public interface IMaintenanceCompanyService {
* @param maintenanceCompany
* @return
*/
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
public MaintenanceCompany saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
/**
* 检查当前的员工编号是否已经存在
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java
View file @ d8e8913b
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
......@@ -63,7 +64,7 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/company/save")
@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) {
public ResponseModel<MaintenanceCompany> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) {
model.setType(COMPANY);
return ResponseHelper.buildResponse(maintenanceCompanyService.saveCompanyDetail(model));
}
......@@ -76,7 +77,7 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/person/save")
@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) {
public ResponseModel<MaintenanceCompany> saveMaintenancePerson(@RequestBody MaintenanceCompany model) {
model.setType(PERSON);
return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model));
}
......@@ -148,7 +149,7 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/department/save")
@ApiOperation(httpMethod = "POST", value = "新增维保部门", notes = "新增维保部门")
public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model) {
public ResponseModel<MaintenanceCompany> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model) {
model.setType(DEPARTMENT);
return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @ d8e8913b
......@@ -234,10 +234,12 @@ public class WaterResourceController extends BaseController {
}
}
// 更新物联信息
if (model.getIsIot()) {
WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
waterResourceIotDto.setResourceId(sequenceNbr);
waterResourceIotService.updateWithModel(waterResourceIotDto);
if (model.getIsIot() != null){
if (model.getIsIot()) {
WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
waterResourceIotDto.setResourceId(sequenceNbr);
waterResourceIotService.updateWithModel(waterResourceIotDto);
}
}
return ResponseHelper.buildResponse(waterResourceDto);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @ d8e8913b
......@@ -107,7 +107,7 @@ public class MaintenanceCompanyServiceImpl
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveCompanyDetail(MaintenanceCompany maintenanceCompany) {
public MaintenanceCompany saveCompanyDetail(MaintenanceCompany maintenanceCompany) {
Long instanceId = saveDynamicFormList(maintenanceCompany);
// 设置单位code
setTargetObjCode(maintenanceCompany);
......@@ -117,15 +117,11 @@ public class MaintenanceCompanyServiceImpl
maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
maintenanceCompany.setIsDelete(false);
try {
this.save(maintenanceCompany);
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
} catch (Exception e) {
e.printStackTrace();
return false;
}
return true;
this.save(maintenanceCompany);
if (maintenanceCompany.getAttachments().isEmpty()){
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
}
return maintenanceCompany;
}
/**
......@@ -144,7 +140,7 @@ public class MaintenanceCompanyServiceImpl
}
@Override
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany) {
public MaintenanceCompany savePersonDetail(MaintenanceCompany maintenanceCompany) {
Long instanceId = saveDynamicFormList(maintenanceCompany);
Long parentId = maintenanceCompany.getParentId();
// 设置人员code
......@@ -156,14 +152,11 @@ public class MaintenanceCompanyServiceImpl
maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setParentId(parentId);
maintenanceCompany.setIsDelete(false);
try {
this.save(maintenanceCompany);
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
} catch (Exception e) {
return false;
}
return true;
this.save(maintenanceCompany);
if (maintenanceCompany.getAttachments().isEmpty()){
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
}
return maintenanceCompany;
}
/**
......@@ -183,7 +176,7 @@ public class MaintenanceCompanyServiceImpl
}
@Override
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany) {
public MaintenanceCompany saveDepartmentDetail(MaintenanceCompany maintenanceCompany) {
Long instanceId = saveDynamicFormList(maintenanceCompany);
Long parentId = maintenanceCompany.getParentId();
setTargetObjCode(maintenanceCompany);
......@@ -193,14 +186,11 @@ public class MaintenanceCompanyServiceImpl
maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
maintenanceCompany.setParentId(parentId);
maintenanceCompany.setIsDelete(false);
try {
this.save(maintenanceCompany);
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
} catch (Exception e) {
return false;
}
return true;
this.save(maintenanceCompany);
if (maintenanceCompany.getAttachments().isEmpty()){
sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
}
return maintenanceCompany;
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment