diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java index 25d0d06f..c450f289 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java @@ -13,6 +13,9 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; import java.util.Date; @@ -424,5 +427,5 @@ public class PayDraftingGroupSubItem implements Serializable { /**审核说明**/ @ApiModelProperty(value = "审核说明") - private Integer checkRemark; + private String checkRemark; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index fd3940c6..4ca240c5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -25,12 +25,15 @@ left join sys_user su on pdg.principal_id_a = su.id left join sys_user su1 on pdg.principal_id_b = su1.id left join pay_working_group pwg on pwg.id = pdg.working_group_id - - left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id - left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id - + left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id + left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id + + + + + + pdgs.check_result = 1 OR pdgs.check_result = 2 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index ebb55581..d45ed8d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.drafting.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; @@ -428,6 +429,10 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listCompanyInfo = payCompanyManagementService.list(companyWrapper); List listContactsName = new ArrayList<>(); + // 导入的数据默认为审核通过状态 + for (PayDraftingGroupSubItem payDraftingGroupSubItem : list) { + payDraftingGroupSubItem.setCheckResult(DraftingConstant.CHECK_PASS); + } // 获取excel中联系人1名称 List listContactsName1 = list.stream().map(PayDraftingGroupSubItem::getContactsNameOne).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listContactsName1)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java index 89a8e75e..4a98ef63 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java @@ -250,8 +250,4 @@ public class PayDraftingGroupSubItemExcel implements Serializable { @Excel(name = "联系人10备注", width = 15) @ApiModelProperty(value = "联系人10备注") private String remarksTen; - - @Excel(name = "标签名称", width = 15) - @ApiModelProperty(value = "标签") - private String label; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java index d4186fb0..6ecbfda4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java @@ -7,6 +7,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; @@ -28,6 +29,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; @@ -38,7 +41,7 @@ import java.util.Objects; @RestController @RequestMapping("/meeting/draftGroupMeeting") @Slf4j -public class DraftGroupMeetingController { +public class DraftGroupMeetingController extends JeroController { @Resource private IPayMeetingService payMeetingService; @Resource @@ -208,4 +211,17 @@ public class DraftGroupMeetingController { List strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1, "C_OPEN_TYPE1"); return Result.OK("发布成功",strings); } + + /** + * 导出excel + */ + @RequiresPermissions("draftGroupMeeting:export") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) { + payMeeting.setMeetingType(MeetingCommon.DRAFTING_GROUP_MEETING_INT); + IPage queryPageList = payMeetingService.queryPageList(payMeeting, -1, -1, request); + List exportList = payMeetingService.getExportList(request, queryPageList); + Class aClass = payMeetingService.getaClass(MeetingCommon.DRAFTING_GROUP_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 3a791857..585a682f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1006,10 +1006,9 @@ public class PayMeetingServiceImpl extends ServiceImpl