diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 24f8108e..b640933e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -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 getItemByProjectId(@RequestParam(name = "projectId") String projectId) { + SafetyCenterSubitem subitem = safetyCenterSubitemService.getItemByProjectId(projectId); + return Result.OK(subitem); + } + /** + * 编辑 + */ + @AutoLog(value = "功能安全中心成员-企业端-编辑") + @ApiOperation(value = "功能安全中心成员-企业端-编辑") + @PostMapping(value = "/editByCompany") + public Result editByCompany(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { + safetyCenterSubitemService.editById(safetyCenterSubitem); + return Result.OK(Result.EDIT_SUCCESS); + } + /** * 通过id删除 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 87791071..074b49b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -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 wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitem::getProjectId,projectId); + wrapper1.eq(SafetyCenterSubitem::getCompanyId,sysUser.getCompanyId()); + SafetyCenterSubitem subitem = this.getOne(wrapper1); + //根据企业id获取所有联系人 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitem.getId()); + //根据orderNum排序 + wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum); + List contactsList = contactsService.list(wrapper); + //存入数据 + subitem.setContactsId(contactsList.get(0).getContactsId()); + subitem.setContactsList(contactsList); + return subitem; + } }