Merge branch 'master' into xuqiubiangeng1026

# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java

@@ -23,7 +23,9 @@ public enum CompanyMessageEnums {
     MSG9("QY_9_YJTZ_MAIL","邮寄通知","projectName"),//查看该物流信息，projectName
     MSG10("QY_10_YJTZ_MAIL_CONTRACT","邮寄通知","contractName"),//查看该物流信息，contractName
     MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情
-    MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName");//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
+    MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName"),//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
+    MSG13("QY_13_HYTZ_FBW_CREATE","会议通知","meetingName,busId");//点击跳转到报名页面，meetingName,busId
+
 
 
     private String code;

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java

@@ -33,7 +33,8 @@ public enum MessageUrlEnums {
     C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
     C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
     C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
-    C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
+    C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal"),
+    C_OPEN_TYPE13("C_OPEN_TYPE13","href","");
 
     /**
      * 业务类型(email:邮件 bpm:流程)

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java

@@ -77,8 +77,7 @@ public class SendMessageServiceImpl implements SendMessageService {
         if(!Objects.isNull(map)) {
             // 替换企业端系统url与小程序名称
             // todo 替换系统地址，小程序名称
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
-                    ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
@@ -223,8 +222,9 @@ public class SendMessageServiceImpl implements SendMessageService {
                 }
 
             }
-            // 会议通知 去掉 工作组xxx（会议名称）报名已开始，点击报名>>超链接中的busId
+            // 会议通知 去掉 工作组/分标委xxx（会议名称）报名已开始，点击报名>>超链接中的busId
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())){
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
+                || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){
                 if(map.containsKey("busId")){
                     map.remove("busId");
                 }
@@ -369,6 +369,12 @@ public class SendMessageServiceImpl implements SendMessageService {
                         signature = "中汽中心标准所";
                         templateId =  "e1a089109aaa4820927d488613171b54";//todo 审核不通过
                         break;
+                    case "QY_13_HYTZ_FBW_CREATE":
+                        //中汽中心标准所-企业端-会议通知-13
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "926e49e09008438b88d80849fe9f5bbb";
+                        break;
                     default:
                         throw new JeroBootException("codeType flase.");
                 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java

@@ -164,11 +164,15 @@ public class PaySpendingContract implements Serializable {
     @ApiModelProperty(value = "合同约定付款次数")
     private String contractPaymentTimes;
 	/**是否打包（1：是，0：否）*/
+//	@Excel(name = "是否打包（1：是，0：否）", width = 15)
     @ApiModelProperty(value = "是否打包（1：是，0：否）")
+//    @NotNull(message = "是否打包不能为空")
+//    @Dict(dicCode = "yn")
     private Integer pack;
 	/**打包年份*/
+//	@Excel(name = "打包年份", width = 15)
     @ApiModelProperty(value = "打包年份")
-    @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误")
+//    @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误")
     private String packYear;
     /**合同状态（2：已通过，3：未通过，4：已归档）*/
     @Excel(name = "合同状态（2：已通过，3：未通过，4：已存档）", width = 15)

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -251,10 +251,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("收入合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
+            throw new JeroBootException("收入合同不可操作！");
-                throw new JeroBootException("收入合同不可操作！");
-            }
         }
         // 项目已打包
         if(Objects.equals(payIncomeContractStatus.getPack(),PayIncomeContractCommon.PACK1)){
@@ -320,10 +318,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
+            throw new JeroBootException("收入合同不可操作！");
-                throw new JeroBootException("收入合同不可操作！");
-            }
         }
         if(Objects.isNull(payIncomeContract.getAmountReceived())){
             payIncomeContract.setAmountReceived(new BigDecimal("0.00"));
@@ -598,10 +594,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
+            throw new JeroBootException("收入合同不可操作！");
-                throw new JeroBootException("收入合同不可操作！");
-            }
         }
         // 查看项目类型
         switch (String.valueOf(payIncomeContractAssociated.getProjectType())){
@@ -750,10 +744,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractNew.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),payIncomeContractNew.getPrincipalId())){
+            throw new JeroBootException("收入合同不可操作！");
-                throw new JeroBootException("收入合同不可操作！");
-            }
         }
         // 验证合同状态是否为草稿或者未通过
         if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS2)
@@ -1010,10 +1002,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("收入合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
+            throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可操作！");
-                throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可操作！");
-            }
         }
         if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
                 && !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
@@ -1044,14 +1034,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         StringBuilder msg = new StringBuilder();
         StringBuilder msg1 = new StringBuilder();
         listPayIncomeContractStatus.forEach(p->{
-            if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+            if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),p.getPrincipalId())){
-                if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){
+                msg.append(p.getContractName() + "收入合同不可操作！");
-                    msg.append("收入合同不可操作！");
-                }
             }
             if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
                     && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
-                msg1.append("收入合同不可删除！");
+                msg1.append(p.getContractName() + "收入合同不可删除！");
             }
         });
         if(!StringUtils.isEmpty(msg)){

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -208,6 +208,10 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         if(Objects.isNull(paySpendingContractStatus)){
             throw new JeroBootException("支出合同不存在！");
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
+            throw new JeroBootException("支出合同不可操作！");
+        }
         List<PaySpendingContractInstallment> listPaySpendingContractInstallment = new ArrayList<>();
         if(!CollectionUtils.isEmpty(input.getInstallment())){
             listPaySpendingContractInstallment = input.getInstallment();
@@ -271,10 +275,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
             throw new JeroBootException("支出合同不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
-            if(!Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
+            throw new JeroBootException("支出合同不可操作！");
-                throw new JeroBootException(paySpendingContractStatus.getContractName() + "支出合同不可操作！");
-            }
         }
         paySpendingContractService.removeById(id);
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
@@ -291,6 +293,20 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         if(CollectionUtils.isEmpty(listPaySpendingContractStatus)){
             throw new JeroBootException("支出合同不存在！");
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        StringBuilder msg = new StringBuilder();
+        if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+            listPaySpendingContractStatus.forEach(p->{
+                if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){
+                    msg.append(p.getContractName() + "支出合同不可操作！");
+                }
+            });
+        }
+
+        if(!StringUtils.isEmpty(msg)){
+            throw new JeroBootException(msg.toString());
+        }
+
         paySpendingContractService.removeByIds(ids);
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
         updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java

@@ -66,7 +66,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
      * 分页列表查询
      */
     @CompanyNameTranslate
-    @RequiresPermissions("otherMeeting:search")
+    @RequiresPermissions("meetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMeetingSituation payMeetingSituation,
@@ -131,7 +131,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 添加参会人
      */
-    @RequiresPermissions("otherMeeting:add")
+    @RequiresPermissions("meetingSituation:add")
     @AutoLog(value = "参会人员信息-添加参会人")
     @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人")
     @PostMapping(value = "/add")
@@ -156,7 +156,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
      * 编辑
      */
     @AutoLog(value = "参会人员信息-编辑")
-    @RequiresPermissions("otherMeeting:edit")
+    @RequiresPermissions("meetingSituation:edit")
     @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
@@ -179,7 +179,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 通过id删除
      */
-    @RequiresPermissions("otherMeeting:delete")
+    @RequiresPermissions("meetingSituation:delete")
     @AutoLog(value = "参会人员信息-通过id删除")
     @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除")
     @GetMapping(value = "/delete")
@@ -191,7 +191,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 批量删除
      */
-    @RequiresPermissions("otherMeeting:batchDel")
+    @RequiresPermissions("meetingSituation:batchDel")
     @AutoLog(value = "参会人员信息-批量删除")
     @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -235,7 +235,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 导出excel
      */
-    @RequiresPermissions("otherMeeting:export")
+    @RequiresPermissions("meetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
         QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml

@@ -153,7 +153,7 @@
     </select>
 
     <select id="pageListContract" resultMap="PayMeetingSituationResultMap">
-        select pms.*
+        select distinct pms.*
         from pay_meeting_situation pms
                      left JOIN pay_payment_record ppr ON ppr.project_id = pms.id
         ${ew.customSqlSegment}

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -227,7 +227,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             //应收金额
             String amountReceivable = projectSubitemExcel.getAmountReceivable();
             if (!NumberUtil.isNumber(amountReceivable)) {
-                errorMessage.add("第" + errorRowNum + "行：应收金额不符合规范");
+                errorMessage.add("第" + errorRowNum + "行：应收金额格式错误");
             } else {
                 projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
             }
@@ -235,7 +235,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
             Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String paymentMethod = projectSubitemExcel.getPaymentMethod();
-            if (paymentTypeMap.containsKey(paymentMethod)) {
+            if (StringUtils.isBlank(paymentMethod)){
+                errorMessage.add("第" + errorRowNum + "行：来款方式不能为空");
+            }else if (paymentTypeMap.containsKey(paymentMethod)) {
                 projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
             } else {
                 errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
@@ -244,7 +246,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
             Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String needInvoice = projectSubitemExcel.getNeedInvoice();
-            if (invoiceTypeMap.containsKey(needInvoice)) {
+            if (StringUtils.isBlank(needInvoice)){
+                errorMessage.add("第" + errorRowNum + "行：需要发票不能为空");
+            }else if (invoiceTypeMap.containsKey(needInvoice)) {
                 projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
             } else {
                 errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");

jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java

@@ -57,6 +57,10 @@ public class PayPackCompany implements Serializable {
 //	@Excel(name = "企业联系人id", width = 15)
     @ApiModelProperty(value = "企业联系人id")
     private java.lang.String companyContactTemporaryId;
+    /**企业联系人*/
+    @Excel(name = "企业联系人", width = 15)
+    @ApiModelProperty(value = "企业联系人")
+    private java.lang.String companyContactTemporaryName;
     /**打包年份*/
     @Excel(name = "打包年份", width = 15)
     @ApiModelProperty(value = "打包年份")
@@ -121,21 +125,17 @@ public class PayPackCompany implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-    /**企业联系人*/
-    @Excel(name = "企业联系人", width = 15)
-    @ApiModelProperty(value = "企业联系人")
-    private java.lang.String companyContactTemporaryName;
     /**
      * 手机号
      */
-    @Excel(name = "联系人电话", width = 15)
+//    @Excel(name = "联系人电话", width = 15)
     @TableField(exist = false)
     @ApiModelProperty(value = "手机号")
 	private String phone;
     /**
      * 邮箱
      */
-    @Excel(name = "邮箱", width = 15)
+//    @Excel(name = "邮箱", width = 15)
     @TableField(exist = false)
     @ApiModelProperty(value = "邮箱")
 	private String email;

jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java

@@ -198,31 +198,6 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
         //创建时间/创建人/修改时间/修改人
         LoginUser user = TokenUtils.getUserByToken();
         BaseUtil.update(stableCrossTraining, user.getId());
-        //添加宣贯培训
-        LambdaUpdateWrapper<StableCrossTraining> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(StableCrossTraining::getId, stableCrossTraining.getId())
-                .set(StringUtils.isNotBlank(stableCrossTraining.getName()), StableCrossTraining::getName, stableCrossTraining.getName())//会议名称
-                .set(stableCrossTraining.getMeetingType() != null, StableCrossTraining::getMeetingType, stableCrossTraining.getMeetingType())//培训类型：1.标准宣贯, 2.学习培训
-                .set(stableCrossTraining.getMeetingState() != null, StableCrossTraining::getMeetingState, stableCrossTraining.getMeetingState())//会议状态: 1.可报名, 2.已结束
-                .set(StringUtils.isNotBlank(stableCrossTraining.getYear()), StableCrossTraining::getYear, stableCrossTraining.getYear())//年份
-                .set(stableCrossTraining.getConvokeStartTime() != null, StableCrossTraining::getConvokeStartTime, stableCrossTraining.getConvokeStartTime())//召开开始时间
-                .set(stableCrossTraining.getConvokeEndTime() != null, StableCrossTraining::getConvokeEndTime, stableCrossTraining.getConvokeEndTime())//召开结束时间
-                .set(StringUtils.isNotBlank(stableCrossTraining.getConvokeLocale()), StableCrossTraining::getConvokeLocale, stableCrossTraining.getConvokeLocale())//召开地点
-                .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式
-                .set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件
-                .set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件
-                .set(StableCrossTraining::getPaymentQrCode, stableCrossTraining.getPaymentQrCode())//付款二维码
-                .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介
-                .set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注
-                .set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码
-                .set(StringUtils.isNotBlank(stableCrossTraining.getPlaceName()), StableCrossTraining::getPlaceName, stableCrossTraining.getPlaceName())//召开省市地点名称
-                .set(StringUtils.isNotBlank(stableCrossTraining.getSignInTime()), StableCrossTraining::getSignInTime, stableCrossTraining.getSignInTime())//召开省市地点名称
-                .set(stableCrossTraining.getSignInStart() != null, StableCrossTraining::getSignInStart, stableCrossTraining.getSignInStart())//召开省市地点名称
-                .set(stableCrossTraining.getSignInEnd() != null, StableCrossTraining::getSignInEnd, stableCrossTraining.getSignInEnd())//召开省市地点名称
-                .set(StableCrossTraining::getUpdateBy, stableCrossTraining.getUpdateBy())//修改人
-                .set(StableCrossTraining::getUpdateTime, stableCrossTraining.getUpdateTime());//修改时间
-        //TODO 酒店信息
-//        stableCrossTraining.getId()
         //添加酒店信息
         LambdaQueryWrapper<HotelManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HotelManagement::getTrainingId, stableCrossTraining.getId());
@@ -237,7 +212,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
                 .setMeetingType(1).setId(hotelManagements.get(0).getId());
         hotelManagementService.edit(hotelManagement);
         //编辑宣贯信息
-        return stableCrossTrainingService.update(updateWrapper);
+        return stableCrossTrainingService.updateById(stableCrossTraining);
     }