合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     public ResponseBean cancelSignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
         
         ResponseBean responseBean = new ResponseBean();
         
                                      @RequestParam("activityId") Integer activityId,
                                      HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
 
         ResponseBean responseBean = new ResponseBean();
         if (!check(communityId)) {

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

      * 查询当前人员是否已签到
      *
      */
-    TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
+    TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID,@Param("communityId") Integer communityId);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

             tpActivity.setUserName(tpUser.getUserName());
         }
         //查看当前人是否签到
-        TpActivitySignIn tpActivitySignIn = tpActivitySignInMapper.selectSing(activityId, userId);
+        TpActivitySignIn tpActivitySignIn = tpActivitySignInMapper.selectSing(activityId, userId,communityId);
         Integer signType = tpActivitySignIn == null ? 0 : 1;
         tpActivity.setSignType(signType);
 

CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignInMapper.xml

     where
     activity_id = #{activityId,jdbcType=INTEGER}
     and ta_user_id = #{userID,jdbcType=INTEGER}
+    and community_id = #{communityId,jdbcType=INTEGER}
   </select>
 
   <select id="toSignUp" resultMap="BaseResultMap">

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

                 return responseBean;
             }
         }
-        // 手机号不存时可以更新
+        // 手机号不存在时可以更新
         if (null == operateTel){
             toOperateTelMapper.updateByPrimaryKey(toOperateTel);
             responseBean.addSuccess("成功");

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

         Row row = sheet.createRow(0);
         Cell cell = row.createCell(0);
         cell.setCellValue("编号");
-        cell = row.createCell(0);
-        cell.setCellValue("车牌号");
         cell = row.createCell(1);
-        cell.setCellValue("续期时长（月）");
+        cell.setCellValue("车牌号");
         cell = row.createCell(2);
-        cell.setCellValue("续期费用（元）");
+        cell.setCellValue("续期时长（月）");
         cell = row.createCell(3);
-        cell.setCellValue("缴费订单号");
+        cell.setCellValue("续期费用（元）");
         cell = row.createCell(4);
-        cell.setCellValue("缴费人手机号");
+        cell.setCellValue("缴费订单号");
         cell = row.createCell(5);
-        cell.setCellValue("缴费人姓名");
+        cell.setCellValue("缴费人手机号");
         cell = row.createCell(6);
-        cell.setCellValue("缴费方式");
+        cell.setCellValue("缴费人姓名");
         cell = row.createCell(7);
-        cell.setCellValue("延期后到期日");
+        cell.setCellValue("缴费方式");
         cell = row.createCell(8);
+        cell.setCellValue("延期后到期日");
+        cell = row.createCell(9);
         cell.setCellValue("缴费完成时间");
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

 import com.community.commom.utils.BeanTools;
 import com.community.huiju.common.base.QRCode;
 import com.community.huiju.common.perproties.QRCodePerproties;
-import com.community.huiju.dao.MessageMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TdImagesMapper;
-import com.community.huiju.dao.TpActivityMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITdImagesService;
 
     @Autowired
     private QRCodePerproties qrCodePerproties;
+    @Autowired
+    private TpActivitySignInMapper tpActivitySignInMapper;
 
     @Override
     public ResponseBean listQuery(String parameter, UserElement userElement) {
                 User updateUser = iUserService.getById(activity.getUpdateUser());
                 activityVO.setUpdateUserName(updateUser.getUserName());
             }
-            // TODO 临时数据
-            activityVO.setSignInCount(1);
+            QueryWrapper<TpActivitySignIn> tpActivitySignIn= new QueryWrapper<>();
+            tpActivitySignIn.eq("activity_id",activity.getId());
+            tpActivitySignIn.eq("community_id",activity.getCommunityId());
+            Integer tpActivitySignInCount= tpActivitySignInMapper.selectCount(tpActivitySignIn);
+            activityVO.setSignInCount(tpActivitySignInCount);
             return activityVO;
         }).collect(Collectors.toList());
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivitySignUpServiceImpl.java

     @Autowired
     private TaSysRoleMapper taSysRoleMapper;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
 
 
     @Override
             ActivitySignUpVO activitySignUpVO = new ActivitySignUpVO();
             BeanTools.copyProperties(e, activitySignUpVO);
 
-            TaUser taUser = taUserMapper.selectById(e.getTaUserId());
+            //根据房产ID-去查询用户ID
+            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(e.getTaUserId());
+            TaUser taUser = taUserMapper.selectById(taUserVerify.getUserId());
 
             activitySignUpVO.setUserName(taUser.getUserName());
             activitySignUpVO.setPhone(taUser.getLoginName());

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java

 		tpRentalHouseImgQueryWrapper.eq("rental_house_id",tpRentalHouse.getId());
 		tpRentalHouseImgQueryWrapper.eq("img_type","1");
 		TpRentalHouseImg tpRentalHouseImg = tpRentalHouseImgMapper.selectOne(tpRentalHouseImgQueryWrapper);
-		tpRentalHouse.setAppListImg(tpRentalHouseImg.getImgUrl());
+		if (null != tpRentalHouseImg){
+			tpRentalHouse.setAppListImg(tpRentalHouseImg.getImgUrl());
+		}
 		//获取公寓轮播图图片
 		QueryWrapper<TpRentalHouseImg> carouseQueryWrapper = new QueryWrapper<>();
 		carouseQueryWrapper.eq("community_id", tpRentalHouse.getCommunityId());

VUECODE/smart-property-manage/src/views/message/index.vue

     },
     // 活动
      activityDetails(id) { // 查看活动
-      this.$router.push({ name: 'activity-info', params: { id: id }})
+      this.$router.push({ name: 'activity-info', query: { id: id }})
     },
     //工单
     ticketDetails(id) {

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

         <el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 620px;"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
-        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在活动详情页</span>
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页</span>
         <div >
           <el-upload
             :show-file-list="false"
         </div>
       </el-form-item>
       <div style="width: 500px;">
-        <span style="color: darkgray;">选择扫码签到，活动发布后点击活动详情可以下载二维码图片，打印图片放置到活动现场，参加活动的用户即可扫码签到，方便统计活动实际参与人数。</span>
+        <span style="color: darkgray;font-size:14px">选择扫码签到，活动发布后点击活动详情可以下载二维码图片，打印图片放置到活动现场，参加活动的用户即可扫码签到，方便统计活动实际参与人数。</span>
       </div>
       <el-form-item label="权重值" prop="sort" style="margin-top: 20px;">
         <div style="display: flex; width: 620px; justify-content: flex-end;">
         </div>
       </el-form-item>
       <div style="width: 500px;">
-        <span style="color: darkgray;">权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序</span>
+        <span style="color: darkgray;font-size:14px">权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序</span>
       </div>
       <el-form-item style="display: flex; justify-content: center; margin-top: 20px;">
         <el-button type="primary" @click="resetForm('ruleForm')">存为草稿</el-button>
       uploadImgUrl: process.env.BASE_API + '/uploadimage'
     }
   },
+  // created() {
+  //   this.ruleForm.activityContent = `<p><span style="color: darkgray;">iiiiii</span></p>`
+  // },
   methods: {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

         <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
-        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在活动详情页</span>
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页</span>
         <div >
           <div style="width: 500px;">
             <el-upload
         </div>
       </el-form-item>
       <div style="width: 500px;">
-        <span style="color: darkgray;">选择扫码签到，活动发布后点击活动详情可以下载二维码图片，打印图片放置到活动现场，参加活动的用户即可扫码签到，方便统计活动实际参与人数。</span>
+        <span style="color: darkgray;font-size:14px">选择扫码签到，活动发布后点击活动详情可以下载二维码图片，打印图片放置到活动现场，参加活动的用户即可扫码签到，方便统计活动实际参与人数。</span>
       </div>
       <el-form-item prop="sort" label="权重值" style="margin-top: 20px;">
         <div style="display: flex; width: 620px;  justify-content: flex-end;">
         </div>
       </el-form-item>
       <div style="width: 500px;">
-        <span style="color: darkgray;">权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序</span>
+        <span style="color: darkgray;font-size:14px">权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序</span>
       </div>
       <el-form-item style="display: flex; justify-content: center; margin-top: 20px;">
         <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="180px" class="ruleForm">
+    <el-form ref="ruleForm" :model="ruleForm" label-position="left" label-width="180px" class="ruleForm">
       <el-form-item label="活动标题">
         <span>{{ ruleForm.activityTitle }}</span>
       </el-form-item>
   },
   mounted() {
     this.ruleForm.id = this.$route.query.id
+    console.log('this.ruleForm.id',this.ruleForm.id)
     this.getById()
   },
   methods: {