springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
@@ -151,17 +151,11 @@ continue; } vo.setSkillName(oneData.get(5)); if (StringUtils.isEmpty(oneData.get(6))) { index++; mistakes.add(setErrorObject(oneData,"是否是大学生不可为空，请填写是否是大学生")); continue; vo.setIsUniversity(2); if (StringUtils.isNotEmpty(oneData.get(6))) { vo.setIsUniversity(1); vo.setUniversityName(oneData.get(6)); } if(!oneData.get(6).equals("1") && !oneData.get(6).equals("2")){ index++; mistakes.add(setErrorObject(oneData,"是否是大学生选择错误,请选择是否")); continue; } vo.setIsUniversity(Integer.parseInt(oneData.get(6))); voList.add(vo); index++; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; @@ -217,6 +218,9 @@ @ApiModelProperty(value = "评价内容") private String content; @ApiModelProperty(value = "评价记录") private List<ComActEasyPhotoEvaluateVo> evaluateList; @ApiModelProperty(value = "微心愿分配人员集合") private List<ComActMicroWishHandleVO> handleList;
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.community.volunteer; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -30,7 +31,10 @@ @ExcelProperty(value = "技能", index = 5) private String skillName; @ExcelProperty(value = "是否是大学生", index = 6) @ExcelProperty(value = "在读大学名称", index = 6) private String universityName; @ExcelIgnore private Integer isUniversity; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.partybuilding.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -67,8 +68,10 @@ @ExcelProperty(value = "完成随手拍数量", index = 17) private Integer easyCount; @ExcelIgnore private Long communityId; @ExcelIgnore private Long userId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -7,7 +7,10 @@ import javax.annotation.Resource; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate; import com.panzhihua.service_community.entity.ComActEasyPhotoHandler; import com.panzhihua.service_community.entity.SysTemplateConfig; import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService; @@ -77,6 +80,8 @@ private SysTemplateConfigDao sysTemplateConfigDao; @Resource private ComActEasyPhotoHandlerService easyPhotoHandlerService; @Resource private ComActEasyPhotoEvaluateMapper comActEasyPhotoEvaluateMapper; /** * 分页查询随手拍 * @@ -192,6 +197,10 @@ comActEasyPhotoVO.setEasyPhotoActivityVO(easyPhotoActivityVO); } } PageComActEasyPhotoEvaluateDto evaluateDto = new PageComActEasyPhotoEvaluateDto(); evaluateDto.setServiceId(id); evaluateDto.setServiceType(ComActEasyPhotoEvaluate.ServiceType.SSP); comActEasyPhotoVO.setEvaluateList(comActEasyPhotoEvaluateMapper.queryAllByList(evaluateDto)); return R.ok(comActEasyPhotoVO); }
@@ -186,7 +186,8 @@ t.phone, t.apply_reson, t.create_at, t.submit_user_id t.submit_user_id, t.is_university FROM com_mng_volunteer_mng t RIGHT JOIN ( SELECT submit_user_id, MAX( create_at ) create_at FROM com_mng_volunteer_mng WHERE state IN ( 1, 3 ) GROUP BY submit_user_id ) tmp ON t.create_at = tmp.create_at springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -658,6 +659,23 @@ if (partyBuildingMemberVO.getPhotoPath() != null) { comPbMemberDO.setPhotoPath(partyBuildingMemberVO.getPhotoPath()); } if (Objects.nonNull(partyBuildingMemberVO.getType())) { comPbMemberDO.setType(partyBuildingMemberVO.getType()); } if (StringUtils.isNotEmpty(partyBuildingMemberVO.getPosition())) { comPbMemberDO.setPosition(partyBuildingMemberVO.getPosition()); } if (Objects.nonNull(partyBuildingMemberVO.getCheckUnitId())) { comPbMemberDO.setCheckUnitId(partyBuildingMemberVO.getCheckUnitId()); } if (StringUtils.isNotEmpty(partyBuildingMemberVO.getFunction())) { comPbMemberDO.setFunction(partyBuildingMemberVO.getFunction()); } if (Objects.nonNull(partyBuildingMemberVO.getSpecialtyCategory())) { comPbMemberDO.setSpecialtyCategory(partyBuildingMemberVO.getSpecialtyCategory()); comPbMemberDO.setSpecialtyName(partyBuildingMemberVO.getSpecialtyName()); } if (comPbMemberDAO.updateById(comPbMemberDO) > 0) { PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO(); @@ -895,6 +913,7 @@ mistakes.add(roleErrorExcelVo); return; } saveList.add(memberRoleDO); } }); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -188,7 +188,7 @@ '未注册' ELSE '已注册' END status from com_pb_member as m LEFT JOIN sys_user u ON m.id_card = u.id_card LEFT JOIN sys_user u ON m.id_card = u.id_card AND u.`type` = 1 LEFT JOIN com_pb_org o ON m.org_id = o.id LEFT JOIN com_pb_check_unit as cpcu on cpcu.id = m.check_unit_id WHERE @@ -412,7 +412,7 @@ AND caas1.is_volunteer = 1 AND caas1.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL <if test="orgIds != null and orgIds.size > 0"> AND caas1.org_id in AND org_id in <foreach collection="orgIds" item="item" open="(" separator="," close=")"> #{item} </foreach>
