springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java
New file @@ -0,0 +1,22 @@ package com.panzhihua.common.model.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; /** * @author xyh * @date 2021/6/25 15:22 */ @ApiModel("附件资源DTO") @Data public class EventResourceDTO implements Serializable { @ApiModelProperty("地址") private String url; @ApiModelProperty("时间:秒") private Integer resourceTime; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCompleteDTO.java @@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.visit; package com.panzhihua.common.model.dtos.visit; import com.panzhihua.common.model.dtos.EventResourceDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,7 +34,7 @@ @ApiModelProperty("地址备注") private String addressRemark; @ApiModelProperty("异常类型") @ApiModelProperty("0正常，1异常") private Integer exception; @ApiModelProperty("异常描述") @@ -52,16 +53,22 @@ private Integer eventStatus; @ApiModelProperty("生活来源") private String remark; @ApiModelProperty("完成时间") @NotEmpty(message = "完成时间不能为空") private String submitDate; @ApiModelProperty(value = "音频列表") List<String> vosList; List<EventResourceDTO> vosList; @ApiModelProperty(value = "图片列表") List<String> imgList; List<EventResourceDTO> imgList; @ApiModelProperty(value = "视频列表") List<String> videoList; List<EventResourceDTO> videoList; private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -15,7 +15,7 @@ @Data public class EventTasksQuery extends PageDTO implements Serializable { @ApiModelProperty("状态:0全部，1已完成，2未完成") @ApiModelProperty("app状态:0全部，1已完成，2未完成,3正常，7异常| 后台任务状态：0全部，1已走访 2待走访，3已撤销，4异常") private Integer status; @ApiModelProperty("人员标签") @@ -31,4 +31,6 @@ private Long visiterId; private Long communityId; private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.dtos.EventResourceDTO; import com.panzhihua.common.model.vos.grid.EventResourceVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -138,13 +139,13 @@ private List<String> optionList; @ApiModelProperty(value = "音频列表") List<String> vosList; List<EventResourceDTO> vosList; @ApiModelProperty(value = "图片列表") List<String> imgList; List<EventResourceDTO> imgList; @ApiModelProperty(value = "视频列表") List<String> videoList; List<EventResourceDTO> videoList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -6,7 +6,7 @@ import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.grid.*; import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -978,7 +978,14 @@ R list(@RequestBody EventTasksQuery query); /** * 走访任务列表 * app走访任务列表 * @param query * @return */ @PostMapping("/eventvisitingtasks/appTaskList") R appTaskList(@RequestBody EventTasksQuery query); /** * 后台走访任务列表 * @param query * @return */ springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java
@@ -1,11 +1,10 @@ package com.panzhihua.grid_app.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.visit.AppVisitTasksVO; import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO; import com.panzhihua.common.service.grid.GridService; import io.swagger.annotations.Api; @@ -41,6 +40,7 @@ @PostMapping("/taskList") public R taskList(@RequestBody EventTasksQuery query){ query.setCommunityId(this.getCommunityId()); query.setUserId(this.getUserId()); return gridService.taskList(query); } @@ -50,15 +50,16 @@ return gridService.detail(id); } @ApiOperation(value = "开始走访-xyh") @PostMapping("/start") // @ApiOperation(value = "开始走访-xyh") // @PostMapping("/start") public R start(@RequestParam("id") Long id){ return gridService.start(id,this.getUserId()); } @ApiOperation(value = "完成走访记录-xyh") @PostMapping("/complete") public R complete(@RequestBody @Validated EventVisitCompleteDTO taskCompleteDTO){ public synchronized R complete(@RequestBody @Validated EventVisitCompleteDTO taskCompleteDTO){ taskCompleteDTO.setUserId(this.getUserId()); return gridService.complete(taskCompleteDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java
@@ -53,6 +53,7 @@ if(comMngVillageDO == null){ continue; } vo.setName(vo.getName().replace("栋","")); List<ComMngBuildingDO> buildingDOList = this.baseMapper.selectList(new QueryWrapper<ComMngBuildingDO>().eq("street_id",comMngVillageDO.getStreetId()).eq("act_id",communityId).eq("village_id",comMngVillageDO.getVillageId()).eq("name",vo.getName())); if(buildingDOList.size() > 0){ sb.append("街路巷:").append(vo.getAlley()).append(",门牌号:").append(vo.getDoorNo()).append(",楼栋号:").append(vo.getName()).append(";"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1474,6 +1474,11 @@ List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>()); if(!populationDOList.isEmpty()){ populationDOList.forEach(population -> { try { population.setCardNo(AESUtil.encrypt128(population.getCardNoStr(),aesKey)); }catch (Exception e){ } this.baseMapper.updateById(population); }); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -7,7 +7,7 @@ import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO; import com.panzhihua.service_grid.service.EventVisitingTasksService; @@ -117,6 +117,17 @@ return eventVisitingTasksService.list(query); } /** * app走访任务 * @param query * @return */ @PostMapping("/eventvisitingtasks/appTaskList") R appTaskList(@RequestBody EventTasksQuery query){ return eventVisitingTasksService.appTaskList(query); } /** * 走访任务列表 * @param query springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventResourceMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.EventResourceDTO; import com.panzhihua.common.model.dtos.grid.PageEventResourceDTO; import com.panzhihua.service_grid.model.dos.EventResourceDO; import com.panzhihua.common.model.vos.grid.EventResourceVO; @@ -31,5 +32,5 @@ */ IPage<EventResourceVO> findByPage(Page page, @Param("pageEventResourceDTO")PageEventResourceDTO pageEventResourceDTO); List<String> findListByRefId(@Param("id")Long id,@Param("classification")Integer classification,@Param("type")Integer type); List<EventResourceDTO> findListByRefId(@Param("id")Long id, @Param("classification")Integer classification, @Param("type")Integer type); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java
@@ -8,7 +8,7 @@ import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.visit.AppVisitTasksVO; import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.vos.visit.EventVisitListVO; import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO; @@ -42,6 +42,14 @@ * @return */ IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query); /** * appc查看走访任务 * @param page * @param query * @return */ IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query")EventTasksQuery query); /** * 查询走访记录，任务 @@ -84,10 +92,10 @@ /** * 完成走访 * @param taskCompleteDTO * @param complete * @return */ Integer complete(EventVisitCompleteDTO taskCompleteDTO); Integer complete(EventVisitingTasksDO complete); Integer start(EventVisitingTasksDO start); @@ -95,5 +103,4 @@ Map<String, Object> findUserById(Long userId); String getLabel(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
@@ -1,11 +1,9 @@ package com.panzhihua.service_grid.model.dos; import java.util.*; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -201,5 +199,14 @@ */ private Integer outOrLocal; /** * 上报浪潮 */ private String lcUpload; /** * 备注 */ private String remark; } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
@@ -8,18 +8,12 @@ import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.IPageVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO; import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.List; /** @@ -76,6 +70,13 @@ R count(Long communityId); /** * app走访任务 * @param query * @return */ R appTaskList(EventTasksQuery query) throws Exception; /** * 走访任务列表 * @param query * @return springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_grid.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,15 +9,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.enums.PopulPoliticalOutlookEnum; import com.panzhihua.common.model.dtos.EventResourceDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO; import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.visit.*; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; @@ -28,11 +33,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.*; /** @@ -145,13 +145,24 @@ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } if(eventVisitingTasksVO.getVisiterTele() != null){ eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey)); } eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey)); } page.getRecords().forEach(e->{ return R.ok(page); } }); @Override public R appTaskList(EventTasksQuery query) throws Exception{ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query); for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){ if(eventVisitingTasksVO.getNationCode() != null){ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } if(eventVisitingTasksVO.getVisiterTele() != null){ eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey)); } } return R.ok(page); } @@ -251,7 +262,7 @@ visitingTasksDO.setVisiterType(0); visitingTasksDO.setActOpara(0); if(map.get("lat") != null && map.get("lng") != null){ visitingTasksDO.setHappentLatLng(map.get("lat")+"-"+map.get("lng")); visitingTasksDO.setHappentLatLng(map.get("lat")+","+map.get("lng")); } visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode()); visitingTasksDO.setReporting(0); @@ -359,49 +370,59 @@ @Override public R complete(EventVisitCompleteDTO taskCompleteDTO) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId()); if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.JXZ.getCode()){ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ return R.fail("当前状态不可完成走访"); } EventVisitingTasksDO complete = new EventVisitingTasksDO(); BeanUtils.copyProperties(taskCompleteDTO,complete); if(taskCompleteDTO.getException().intValue() == 0){ taskCompleteDTO.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode()); complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode()); }else{ taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode()); complete.setEventStatus(EventTasksStatusEnum.YC.getCode()); } complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT)); JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); json.put("check",taskCompleteDTO.getOption()); taskCompleteDTO.setOption(json.toJSONString()); complete.setTableContentJson(json.toJSONString()); if(!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())){ if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){ taskCompleteDTO.getImgList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,1,e); createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,1,e); }); } if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){ taskCompleteDTO.getVosList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,2,e); createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,2,e); }); } if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){ taskCompleteDTO.getVosList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,3,e); createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e); }); } int rt = eventVisitingTasksMapper.complete(taskCompleteDTO); Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId()); complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString())); complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString())); complete.setGridMember(Long.valueOf(map.get("user_id").toString())); complete.setGridMemberName(map.get("name").toString()); complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString()); int rt = eventVisitingTasksMapper.complete(complete); if(rt > 0){ return R.ok(); } return R.fail(); } private void createResource(Long id, Long dellUserId, int classification, int type,String url) { private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) { EventResourceDO eventResourceDO = new EventResourceDO(); eventResourceDO.setRefId(id); eventResourceDO.setClassification(classification); eventResourceDO.setType(type); eventResourceDO.setCreateBy(dellUserId); eventResourceDO.setUrl(url); eventResourceDO.setUrl(resourceDTO.getUrl()); eventResourceDO.setResourceTime(resourceDTO.getResourceTime()); eventResourceMapper.insert(eventResourceDO); }
@@ -66,7 +66,7 @@ </select> <select id="findListByRefId" resultType="com.panzhihua.common.model.vos.grid.EventResourceVO"> SELECT url FROM event_resource SELECT url,resource_time FROM event_resource where ref_id = #{id} and classification = #{classification} and type = #{type} order by id desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -66,7 +66,13 @@ and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2) and (vt.event_status = 1 or vt.event_status = 2 or vt.event_status = 4) </if> <if test = "query.status == 3"> and vt.event_status = 6 </if> <if test = "query.status == 4"> and vt.event_status = 7 </if> <if test="query.tag != null and query.tag != ''"> p.label like concat('%',#{query.tag},'%') @@ -83,6 +89,32 @@ order by vt.id desc </select> <select id="appFindListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO"> select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status, TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON p.id = vt.visiter_id LEFT JOIN com_mng_building mb ON(p.floor = mb.name AND p.village_id = mb.village_id) LEFT JOIN event_grid_building_relation gbr ON mb.id = gbr.build_id LEFT JOIN event_grid_data gd ON gd.id = gbr.grid_id LEFT JOIN event_grid_member_relation gmr ON gmr.grid_id = gd.id LEFT JOIN sys_user u ON u.user_id = gmr.grid_member_id where u.use_id = #{query.userId} <if test = "query.status == 1"> and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2 or vt.event_status = 4) </if> <if test = "query.status == 3"> and vt.event_status = 6 </if> <if test = "query.status == 4"> and vt.event_status = 7 </if> order by vt.id desc </select> <select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO"> SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.event_status,vt.visiter_address,vt.happent_lat_lng, p.card_no_str,p.name,REPLACE(p.label,',','#') @@ -93,11 +125,8 @@ <if test = "query.communityId !=null"> and vt.grid_member_community = #{query.communityId} </if> <if test = "query.status == 1"> and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2) <if test = "query.status ！= null"> and vt.event_status = #{eventStatus} </if> </select> @@ -133,10 +162,10 @@ WHERE u.community_id = #{communityId} and u.type = #{type} limit 1 </select> <select id="findUserByCommunityId" resultType="java.util.Map"> SELECT u.user_id,u.name,u.phone,u.community_id,a.street_id, FROM sys_user u <select id="findUserById" resultType="java.util.Map"> SELECT u.user_id,u.name,u.phone,u.community_id,a.street_id FROM sys_user u LEFT JOIN com_act a ON u.community_id = a.community_id WHERE u.id = #{id} WHERE u.user_id = #{id} </select> <select id="findPopulationById" resultType="java.util.Map"> @@ -163,15 +192,13 @@ </update> <update id="complete" parameterType="com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO"> <update id="complete" parameterType="com.panzhihua.service_grid.model.dos.EventVisitingTasksDO"> update event_visiting_tasks set event_status = #{eventStatus},address = #{address},address_remark=#{addressRemark}, family_phone =#{familyPhone},family_source = #{familySource},lat_lng=#{latLng},dell_desc = #{dellDesc},table_content_json = #{option} exception = #{exception},submit_date = NOW() family_phone =#{familyPhone},family_source = #{familySource},lat_lng=#{latLng},dell_desc = #{dellDesc},table_content_json = #{tableContentJson}, exception = #{exception},submit_date = #{submitDate},remark = #{remark}, grid_member_street =#{gridMemberStreet},grid_member_community=#{gridMemberCommunity},grid_member=#{gridMember},grid_member_name=#{gridMemberName},grid_menber_tele=#{gridMenberTele} where id = #{id} </update> <select id="getLabel" parameterType="java.lang.Long" resultType="java.lang.String"> select label from com_mng_population where id = #{id} </select> </mapper>
