update 小程序签到和获取签到页面

2021-10-11 18:32:46 +08:00
parent ae01fd3792
commit afffc0a9b5
1 changed files with 33 additions and 34 deletions
@@ -59,6 +59,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
+import java.text.DateFormat;
 import java.util.*;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -111,7 +112,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
    @Resource
    private IPayIncomeContractService payIncomeContractService;

-    private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime","departureTime","checkInHotel"};
+    private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime", "departureTime", "checkInHotel"};

    /**
     * 保存
@@ -129,7 +130,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        // 收入合同创建项目发送消息到项目负责人
        if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
            PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
-            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(),payMeetingSituation.getId(),payMeeting.getDirectorId());
+            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId(), payMeeting.getDirectorId());
        }
        String meetingId = payMeetingSituation1.getMeetingId();
        PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -140,11 +141,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        String contractId = payMeetingSituation.getContractId();
        if (StringUtils.isNotBlank(contractId)) {
            PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
-            if(Objects.isNull(payIncomeContract)){
+            if (Objects.isNull(payIncomeContract)) {
                throw new JeroBootException("合同不存在！");
            }
            // 验证企业是否正确
-            if(!Objects.equals(payMeetingSituation.getCompanyId(),payIncomeContract.getSignedCompanyId())){
+            if (!Objects.equals(payMeetingSituation.getCompanyId(), payIncomeContract.getSignedCompanyId())) {
                throw new JeroBootException("企业不匹配！");
            }
            //合同关联参会人自动审核通过
@@ -189,9 +190,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            sendMessageDTO.setTemplateParam(map);
            sendMessageDTO.setBusType("M_OPEN_TYPE5");
            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id",payMeetingSituation.getId());
-            jsonObject.put("meetingId",payMeeting.getId());
-            jsonObject.put("meetingName",payMeeting.getMeetingName());
+            jsonObject.put("id", payMeetingSituation.getId());
+            jsonObject.put("meetingId", payMeeting.getId());
+            jsonObject.put("meetingName", payMeeting.getMeetingName());
            sendMessageDTO.setBusId(jsonObject.toJSONString());
            sendMessageService.SendMessageService(sendMessageDTO);
        }
@@ -199,7 +200,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

    /**
     * 处理打包情况
-     *
     */
    private void handlePack(PayMeetingSituation payMeetingSituation1) {
        if (payMeetingSituation1.getPack().equals(PayProjectCommon.PACKAGING1)) {
@@ -233,7 +233,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

    /**
     * 报名
-     *
     */
    @Override
    public void signUp(PayMeetingSituation payMeetingSituation) {
@@ -302,7 +301,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
    /**
     * 判断发送哪种类型的消息
     *
-     * @param isSubItem           是否是组成员
+     * @param isSubItem 是否是组成员
     */
    private void judgeSend(PayMeeting payMeeting, PayMeetingSituation payMeetingSituation, boolean isSubItem) {
        Integer payMode = payMeetingSituation.getPayMode();
@@ -358,13 +357,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        sendMessageDTO.setTemplateParam(map);
        sendMessageDTO.setBusType(busType);
        JSONObject jsonObject = new JSONObject();
-        if (companyMessageEnums.equals(CompanyMessageEnums.MSG5)){
-            jsonObject.put("id",payMeetingSituation.getId());
-            jsonObject.put("meetingId",payMeeting.getId());
-            jsonObject.put("meetingName",payMeeting.getMeetingName());
-        }else {
-            jsonObject.put("id",payMeeting.getId());
-            jsonObject.put("situationId",payMeetingSituation.getId());
+        if (companyMessageEnums.equals(CompanyMessageEnums.MSG5)) {
+            jsonObject.put("id", payMeetingSituation.getId());
+            jsonObject.put("meetingId", payMeeting.getId());
+            jsonObject.put("meetingName", payMeeting.getMeetingName());
+        } else {
+            jsonObject.put("id", payMeeting.getId());
+            jsonObject.put("situationId", payMeetingSituation.getId());
        }
        sendMessageDTO.setBusId(jsonObject.toJSONString());
        sendMessageService.SendMessageService(sendMessageDTO);
@@ -372,7 +371,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

    /**
     * 审核
-     *
     */
    @Override
    public void check(CheckVO checkVO) {
@@ -421,8 +419,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

        }
    }
+
    /**
     * 判断是否有权限审核
+     *
     * @author lijiarao
     * @date 2021/9/28
     */
@@ -551,8 +551,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        if (payMeeting == null) {
            throw new JeroBootException("会议不存在");
        }
-
-        if (!belongCalendar(new Date(), payMeeting.getStartSignInTime(), payMeeting.getEndSignInTime())) {
+        Date startTime = payMeeting.getStartSignInTime() != null ? payMeeting.getStartSignInTime() : payMeeting.getStartTime();
+        Date endTime = payMeeting.getEndSignInTime() != null ? payMeeting.getEndSignInTime() : payMeeting.getEndTime();
+        if (!belongCalendar(new Date(), startTime, endTime)) {
            throw new JeroBootException("不在会议可签到时间内,无法签到");
        }
        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -574,16 +575,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            throw new JeroBootException("请上传缴费凭证后再签到");

        }
-        if (StringUtils.isNotBlank(signInVO.getFileId())){
+        if (StringUtils.isNotBlank(signInVO.getFileId())) {
            Integer checkIn = meetingSituation.getCheckIn();
-            if (checkIn.equals(PayProjectCommon.YES)){
+            if (checkIn.equals(PayProjectCommon.YES)) {
                throw new JeroBootException("已经签到，请勿重复签到");
            }
            meetingSituation.setCheckIn(PayProjectCommon.YES);
            meetingSituation.setCheckFile(signInVO.getFileId());
            saveOrUpdate(meetingSituation);
        }
-        return putDate(payMeeting,meetingSituation);
+        return putDate(payMeeting, meetingSituation);
    }

    private SignInPageVO putDate(PayMeeting payMeeting, PayMeetingSituation meetingSituation) {
@@ -615,8 +616,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

        LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PayMeetingSituation::getMeetingId,meetingId);
-        wrapper.eq(PayMeetingSituation::getCompanyContactId,loginUser.getId());
+        wrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
+        wrapper.eq(PayMeetingSituation::getCompanyContactId, loginUser.getId());
        return getOne(wrapper);
    }

@@ -677,7 +678,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            List<String> fieldNames = objRecordUtilModule.getFieldNames();
            List<String> canModifyList = Arrays.asList(CAN_MODIFY_LIST);
            boolean containsAll = canModifyList.containsAll(fieldNames);
-            if (!containsAll){
+            if (!containsAll) {
                throw new JeroBootException("审核通过之后只允许修改行程信息");
            }
        }
@@ -706,7 +707,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                sendMessageDTO.setTemplateParam(map);
                sendMessageDTO.setBusType("M_OPEN_TYPE8");
                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("id",id);
+                jsonObject.put("id", id);
                sendMessageDTO.setBusId(jsonObject.toJSONString());
                sendMessageService.SendMessageService(sendMessageDTO);
            }
@@ -716,7 +717,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        //判断凭证是否修改
        String paymentRecord = oldObject.getPaymentRecord();
        String paymentRecord1 = payMeetingSituation1.getPaymentRecord();
-        if (Objects.equals(paymentRecord,paymentRecord1)){
+        if (Objects.equals(paymentRecord, paymentRecord1)) {
            //上传付款凭证发送邮件提醒审批
            SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
        }
@@ -800,7 +801,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                }
            }
            BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
-        //    参会人
+            //    参会人
        } else if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
            CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
            BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
@@ -822,17 +823,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                String contractId = payMeetingSituation.getContractId();
                if (StringUtils.isNotBlank(contractId)) {
                    PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
-                    if(Objects.isNull(payIncomeContract)){
+                    if (Objects.isNull(payIncomeContract)) {
                        throw new JeroBootException("合同不存在！");
                    }
                    //合同添加的参会人，付款凭证和订单号后四位必填
-                    if (StringUtils.isBlank(paymentRecord)){
+                    if (StringUtils.isBlank(paymentRecord)) {
                        throw new JeroBootException("付款凭证必填");
                    }
                    if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isBlank(orderCode)) {
                        throw new JeroBootException("订单号后四位必填");
                    }
-                }else {
+                } else {
                    //缴费方式为线上缴费时，判断是否为会议期间
                    if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isNotBlank(paymentRecord)) {
                        Date startTime = payMeeting.getStartTime();
@@ -965,7 +966,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

    /**
     * 解除参会人打包
-     *
     */
    private void removeSituationPack(String id) {
        PayMeetingSituation payMeetingSituation = getById(id);
@@ -1053,7 +1053,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat

    /**
     * 判断时间是否在时间段内
-     *
     */
    public static boolean belongCalendar(Date nowTime, Date beginTime,
                                         Date endTime) {