add 功能安全中心成员-企业端-根据项目查询联系人
This commit is contained in:
+23
-1
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.IdsMapBody;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.aspect.annotation.DictPoint;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.drafting.entity.PayDraftingGroupSubItem;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem;
|
||||
import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport;
|
||||
@@ -96,6 +96,28 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
|
||||
return Result.OK(Result.EDIT_SUCCESS);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@DictPoint
|
||||
@AutoLog(value = "功能安全中心成员-企业端-根据项目查询联系人")
|
||||
@ApiOperation(value = "功能安全中心成员-企业端-根据项目查询联系人")
|
||||
@GetMapping(value = "/getItemByProjectId")
|
||||
public Result<SafetyCenterSubitem> getItemByProjectId(@RequestParam(name = "projectId") String projectId) {
|
||||
SafetyCenterSubitem subitem = safetyCenterSubitemService.getItemByProjectId(projectId);
|
||||
return Result.OK(subitem);
|
||||
}
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@AutoLog(value = "功能安全中心成员-企业端-编辑")
|
||||
@ApiOperation(value = "功能安全中心成员-企业端-编辑")
|
||||
@PostMapping(value = "/editByCompany")
|
||||
public Result<String> editByCompany(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) {
|
||||
safetyCenterSubitemService.editById(safetyCenterSubitem);
|
||||
return Result.OK(Result.EDIT_SUCCESS);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
|
||||
+20
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
@@ -15,6 +16,7 @@ import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemContactsImport;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -353,4 +355,22 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public SafetyCenterSubitem getItemByProjectId(String projectId) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
LambdaQueryWrapper<SafetyCenterSubitem> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.eq(SafetyCenterSubitem::getProjectId,projectId);
|
||||
wrapper1.eq(SafetyCenterSubitem::getCompanyId,sysUser.getCompanyId());
|
||||
SafetyCenterSubitem subitem = this.getOne(wrapper1);
|
||||
//根据企业id获取所有联系人
|
||||
LambdaQueryWrapper<SafetyCenterSubitemContacts> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitem.getId());
|
||||
//根据orderNum排序
|
||||
wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum);
|
||||
List<SafetyCenterSubitemContacts> contactsList = contactsService.list(wrapper);
|
||||
//存入数据
|
||||
subitem.setContactsId(contactsList.get(0).getContactsId());
|
||||
subitem.setContactsList(contactsList);
|
||||
return subitem;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user