src/main/java/org/springblade/modules/patrol/entity/PatrolRecord.java
@@ -1,9 +1,6 @@ package org.springblade.modules.patrol.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -65,7 +62,7 @@ /** 修改时间 */ @ApiModelProperty(value = "修改时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("create_time") @TableField(value = "create_time",fill = FieldFill.INSERT) private Date createTime; /** 是否删除 0： 否 1：是 */ src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
@@ -28,6 +28,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.modules.place.dto.PlaceCheckDTO; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.place.entity.PlaceCheckEntity; @@ -56,8 +57,8 @@ @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入placeCheck") public R<PlaceCheckEntity> detail(PlaceCheckEntity placeCheck) { PlaceCheckEntity detail = placeCheckService.getOne(Condition.getQueryWrapper(placeCheck)); public R<PlaceCheckDTO> detail(PlaceCheckEntity placeCheck) { PlaceCheckDTO detail = placeCheckService.selectPlaceCheckById(placeCheck.getId()); return R.data(detail); } /** @@ -88,7 +89,17 @@ @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入placeCheck") public R save(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception { public R save(@Valid @RequestBody PlaceCheckVO placeCheck){ return R.status(placeCheckService.save(placeCheck)); } /** * 场所检查表 新增 */ @PostMapping("/saveTwo") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入placeCheck") public R saveTwo(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception { return R.status(placeCheckService.savePlace(placeCheck)); }
@@ -16,9 +16,13 @@ */ package org.springblade.modules.place.dto; import io.swagger.annotations.ApiModelProperty; import org.springblade.modules.patrol.entity.PatrolRecord; import org.springblade.modules.place.entity.PlaceCheckEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; /** * 场所检查表 数据传输对象实体类 @@ -31,4 +35,26 @@ public class PlaceCheckDTO extends PlaceCheckEntity { private static final long serialVersionUID = 1L; private List<PatrolRecord> patrolRecordVOList; @ApiModelProperty(value = "场所名称", example = "") private String placeName; @ApiModelProperty(value = "场所地址", example = "") private String location; @ApiModelProperty(value = "负责人", example = "") private String principal; @ApiModelProperty(value = "网格名称", example = "") private String gridName; @ApiModelProperty(value = "负责人电话", example = "") private String principalPhone; @ApiModelProperty(value = "街道名称", example = "") private String streetName; @ApiModelProperty(value = "社区名称", example = "") private String communityName; } src/main/java/org/springblade/modules/place/entity/PlaceCheckEntity.java
@@ -71,7 +71,7 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("create_time") @TableField(value = "create_time",fill = FieldFill.INSERT) private Date createTime; /** 是否删除 0：否 1：是 */ src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.java
@@ -17,6 +17,7 @@ package org.springblade.modules.place.mapper; import org.apache.ibatis.annotations.Param; import org.springblade.modules.place.dto.PlaceCheckDTO; import org.springblade.modules.place.entity.PlaceCheckEntity; import org.springblade.modules.place.vo.PlaceCheckVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -41,5 +42,21 @@ List<PlaceCheckVO> selectPlaceCheckPage(IPage page, @Param("placeCheck") PlaceCheckVO placeCheck); /** * 查询场所检查表 * * @param id 场所检查表ID * @return 场所检查表 */ public PlaceCheckDTO selectPlaceCheckById(Long id); /** * 查询场所检查表列表 * * @param placeCheckDTO 场所检查表 * @return 场所检查表集合 */ public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO); } src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -7,13 +7,19 @@ <result column="id" property="id"/> <result column="house_code" property="houseCode"/> <result column="remark" property="remark"/> <result column="image_urls" property="imageUrls"/> <result column="signature_path" property="signaturePath"/> <result column="create_user" property="createUser"/> <result column="create_time" property="createTime"/> <result column="is_deleted" property="isDeleted"/> <result column="place_name" property="placeName"/> <result column="location" property="location"/> <result column="grid_name" property="gridName"/> <result column="principal" property="principal"/> <result column="principal_phone" property="principalPhone"/> <result column="town_name" property="streetName"/> <result column="village_name" property="communityName"/> <collection property="patrolRecordVOList" column="id" select="selectTaskRepairStepList" <collection property="patrolRecordVOList" column="id" javaType="java.util.List" ofType="org.springblade.modules.patrol.entity.PatrolRecord" autoMapping="true"> <id property="placeCheckId" column="id"/> @@ -22,28 +28,80 @@ <!--自定义分页查询--> <select id="selectPlaceCheckPage" resultMap="placeCheckResultMap"> select * from jczz_place_check where is_deleted = 0 SELECT jpc.*, jp.place_name, jp.location, jg.grid_name, jp.principal, jp.principal_phone, br.town_name , br.village_name FROM jczz_place_check jpc LEFT JOIN jczz_place jp ON jpc.house_code = jp.house_code LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code LEFT JOIN blade_region br ON br.`code` = jg.community_code where jpc.is_deleted = 0 <if test="placeCheck.houseCode!=null and placeCheck.houseCode!=''"> and house_code = #{placeCheck.houseCode} and jpc.house_code = #{placeCheck.houseCode} </if> <if test="placeCheck.streetName!=null and placeCheck.streetName!=''"> and br.town_name like concat('%', #{placeCheck.streetName},'%') </if> <if test="placeCheck.communityName!=null and placeCheck.communityName!=''"> and br.village_name like concat('%', #{placeCheck.communityName},'%') </if> <if test="placeCheck.gridName!=null and placeCheck.gridName!=''"> and jg.grid_name like concat('%', #{placeCheck.gridName},'%') </if> <if test="placeCheck.placeName!=null and placeCheck.placeName!=''"> and jp.place_name like concat('%', #{placeCheck.placeName},'%') </if> <if test="placeCheck.principal!=null and placeCheck.principal!=''"> and jp.principal like concat('%', #{placeCheck.principal},'%') </if> <if test="placeCheck.principalPhone!=null and placeCheck.principalPhone!=''"> and jp.principal_phone like concat('%', #{placeCheck.principalPhone},'%') </if> <if test="placeCheck.startTime!=null and placeCheck.startTime!=''"> and date_format(create_time,'%Y-%m-%d') >= #{placeCheck.startTime} and date_format(jpc.create_time,'%Y-%m-%d') >= #{placeCheck.startTime} </if> <if test="placeCheck.endTime!=null and placeCheck.endTime!=''"> and date_format(create_time,'%Y-%m-%d') <= #{placeCheck.endTime} and date_format(jpc.create_time,'%Y-%m-%d') <= #{placeCheck.endTime} </if> </select> <!-- <resultMap type="org.springblade.modules.dto.PlaceCheckDTO" id="PlaceCheckDTOResult">--> <!-- <result property="id" column="id" />--> <!-- <result property="houseCode" column="house_code" />--> <!-- <result property="remark" column="remark" />--> <!-- <result property="signaturePath" column="signature_path" />--> <!-- <result property="createUser" column="create_user" />--> <!-- <result property="createTime" column="create_time" />--> <!-- <result property="isDeleted" column="is_deleted" />--> <!-- </resultMap>--> <resultMap type="org.springblade.modules.place.dto.PlaceCheckDTO" id="PlaceCheckDTOResult"> <result property="id" column="id"/> <result property="houseCode" column="house_code"/> <result property="remark" column="remark"/> <result property="signaturePath" column="signature_path"/> <result property="createUser" column="create_user"/> <result property="createTime" column="create_time"/> <result property="isDeleted" column="is_deleted"/> <result column="place_name" property="placeName"/> <result column="location" property="location"/> <result column="grid_name" property="gridName"/> <result column="principal" property="principal"/> <result column="principal_phone" property="principalPhone"/> <result column="town_name" property="streetName"/> <result column="village_name" property="communityName"/> <collection property="patrolRecordVOList" column="id" javaType="java.util.List" ofType="org.springblade.modules.patrol.entity.PatrolRecord" autoMapping="true"> <id property="placeCheckId" column="id"/> </collection> </resultMap> <sql id="selectPlaceCheck"> select @@ -58,25 +116,39 @@ jczz_place_check </sql> <!-- <select id="selectPlaceCheckById" parameterType="long" resultMap="PlaceCheckDTOResult">--> <!-- <include refid="selectPlaceCheck"/>--> <!-- where--> <!-- id = #{id}--> <!-- </select>--> <select id="selectPlaceCheckById" parameterType="long" resultMap="PlaceCheckDTOResult"> SELECT jpc.*, jp.place_name, jp.location, jg.grid_name, jp.principal, jp.principal_phone, br.town_name , br.village_name FROM jczz_place_check jpc LEFT JOIN jczz_place jp ON jpc.house_code = jp.house_code LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code LEFT JOIN blade_region br ON br.`code` = jg.community_code where jpc.is_deleted = 0 and jpc.id = #{id} </select> <!-- <select id="selectPlaceCheckList" parameterType="org.springblade.modules.dto.PlaceCheckDTO" resultMap="PlaceCheckDTOResult">--> <!-- <include refid="selectPlaceCheck"/>--> <!-- <where>--> <!-- <if test="id != null "> and id = #{id}</if>--> <!-- <if test="houseCode != null and houseCode != ''"> and house_code = #{houseCode}</if>--> <!-- <if test="remark != null and remark != ''"> and remark = #{remark}</if>--> <!-- <if test="signaturePath != null and signaturePath != ''"> and signature_path = #{signaturePath}</if>--> <!-- <if test="createUser != null "> and create_user = #{createUser}</if>--> <!-- <if test="createTime != null "> and create_time = #{createTime}</if>--> <!-- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>--> <!-- </where>--> <!-- </select>--> <select id="selectPlaceCheckList" parameterType="org.springblade.modules.place.dto.PlaceCheckDTO" resultMap="PlaceCheckDTOResult"> <include refid="selectPlaceCheck"/> <where> <if test="id != null ">and id = #{id}</if> <if test="houseCode != null and houseCode != ''">and house_code = #{houseCode}</if> <if test="remark != null and remark != ''">and remark = #{remark}</if> <if test="signaturePath != null and signaturePath != ''">and signature_path = #{signaturePath}</if> <if test="createUser != null ">and create_user = #{createUser}</if> <if test="createTime != null ">and create_time = #{createTime}</if> <if test="isDeleted != null ">and is_deleted = #{isDeleted}</if> </where> </select> </mapper> src/main/java/org/springblade/modules/place/service/IPlaceCheckService.java
@@ -17,10 +17,13 @@ package org.springblade.modules.place.service; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.modules.place.dto.PlaceCheckDTO; import org.springblade.modules.place.entity.PlaceCheckEntity; import org.springblade.modules.place.vo.PlaceCheckVO; import org.springblade.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** * 场所检查表 服务类 @@ -41,4 +44,20 @@ Boolean savePlace(PlaceCheckVO placeCheck) throws Exception; /** * 查询场所检查表 * * @param id 场所检查表ID * @return 场所检查表 */ public PlaceCheckDTO selectPlaceCheckById(Long id); /** * 查询场所检查表列表 * * @param placeCheckDTO 场所检查表 * @return 场所检查表集合 */ public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO); } src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -17,9 +17,11 @@ package org.springblade.modules.place.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.modules.patrol.entity.PatrolRecord; import org.springblade.modules.patrol.service.IPatrolRecordService; import org.springblade.modules.place.dto.PlaceCheckDTO; import org.springblade.modules.place.entity.PlaceCheckEntity; import org.springblade.modules.place.vo.PlaceCheckVO; import org.springblade.modules.place.mapper.PlaceCheckMapper; @@ -49,12 +51,14 @@ @Override @Transactional(rollbackFor = Exception.class) public Boolean savePlace(PlaceCheckVO placeCheck) throws Exception { placeCheck.setCreateUser(AuthUtil.getUserId()); boolean save = save(placeCheck); if (save) { IPatrolRecordService bean = SpringUtil.getBean(IPatrolRecordService.class); List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList(); patrolRecordVOList.stream().forEach(item -> { item.setPlaceCheckId(placeCheck.getId()); item.setCreateUser(AuthUtil.getUserId()); }); boolean b = bean.saveBatch(placeCheck.getPatrolRecordVOList()); if (b) { @@ -64,4 +68,28 @@ } return false; } /** * 查询场所检查表 * * @param id 场所检查表ID * @return 场所检查表 */ @Override public PlaceCheckDTO selectPlaceCheckById(Long id) { return this.baseMapper.selectPlaceCheckById(id); } /** * 查询场所检查表列表 * * @param placeCheckDTO 场所检查表 * @return 场所检查表集合 */ @Override public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO) { return this.baseMapper.selectPlaceCheckList(placeCheckDTO); } } src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
@@ -16,6 +16,7 @@ */ package org.springblade.modules.place.vo; import io.swagger.annotations.ApiModelProperty; import liquibase.pro.packaged.P; import org.springblade.modules.grid.entity.GridPatrolRecordEntity; import org.springblade.modules.patrol.entity.PatrolRecord; @@ -51,4 +52,25 @@ private List<PatrolRecord> patrolRecordVOList; @ApiModelProperty(value = "场所名称", example = "") private String placeName; @ApiModelProperty(value = "场所地址", example = "") private String location; @ApiModelProperty(value = "负责人", example = "") private String principal; @ApiModelProperty(value = "网格名称", example = "") private String gridName; @ApiModelProperty(value = "负责人电话", example = "") private String principalPhone; @ApiModelProperty(value = "街道名称", example = "") private String streetName; @ApiModelProperty(value = "社区名称", example = "") private String communityName; }
