skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
@@ -3,12 +3,17 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @PROJECT_NAME: skjcmanager @@ -17,8 +22,9 @@ * @DATE: 2023/5/30 14:52 */ @Data @TableName("sm_materials_manage") @TableName(value = "sm_materials_manage",autoResultMap = true) @ApiModel(value = "应急物资管理对象", description = "应急物资管理对象") @EqualsAndHashCode(callSuper = true) public class MaterialsManage extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -86,4 +92,25 @@ @ApiModelProperty(value = "备注") private String remarks; /** * 合同 */ @ApiModelProperty(value = "合同") @TableField(value = "contract",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED) private Object[] contract; /** * 图片 */ @ApiModelProperty("图片") @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED) private Object[] images; /** * 入库时间 */ @ApiModelProperty(value = "入库时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date importTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
@@ -2,7 +2,36 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="cn.gistack.sm.materials.mapper.MaterialsManageMapper"> <!--namespace根据自己需要创建的的mapper的路径和名称填写--> <select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.MaterialsManageVO"> <resultMap id="vo" type="cn.gistack.sm.materials.vo.MaterialsManageVO"> <id property="id" column="id"/> <result property="resGuid" column="res_guid"/> <result property="resName" column="res_name"/> <result property="city" column="city"/> <result property="cityName" column="cityName"/> <result property="county" column="county"/> <result property="countyName" column="countyName"/> <result property="town" column="town"/> <result property="townName" column="townName"/> <result property="materialsType" column="MATERIALS_TYPE"/> <result property="materialsName" column="MATERIALS_NAME"/> <result property="materialsAmount" column="MATERIALS_AMOUNT"/> <result property="materialsUnit" column="MATERIALS_UNIT"/> <result property="remarks" column="REMARKS"/> <result property="contract" column="contract" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="importTime" column="import_time"/> <result property="status" column="status"/> <result property="createTime" column="create_time"/> <result property="createUser" column="create_user"/> <result property="createDept" column="create_dept"/> <result property="updateUser" column="update_user"/> <result property="updateTime" column="update_time"/> <result property="isDeleted" column="is_deleted"/> </resultMap> <select id="selectMyPage" resultMap="vo"> SELECT MM.*, aab1."ad_name" cityName, aab2."ad_name" countyName, @@ -29,5 +58,12 @@ <if test="vo.town !=null and vo.town !=''"> AND MM.town = #{vo.town} </if> <if test="vo.resGuid !=null and resGuid !=''"> AND MM.res_guid = #{vo.resGuid} </if> <if test="vo.year!=null and vo.year!=''"> and date_format(MM.IMPORT_TIME,'%Y') = #{vo.year} </if> ORDER BY MM.IMPORT_TIME DESC </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
@@ -30,5 +30,11 @@ <if test="vo.town !=null and vo.town !=''"> AND RM.town = #{vo.town} </if> <if test="vo.resGuid !=null and resGuid !=''"> AND MM.res_guid = #{vo.resGuid} </if> <if test="vo.year!=null and vo.year!=''"> and date_format(RM.create_time,'%Y') = #{vo.year} </if> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/MaterialsManageVO.java
@@ -25,4 +25,8 @@ * 物资类型名 */ private String materialTypeName; /** * 年份 */ private String year; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/RescueTeamManageVO.java
@@ -21,4 +21,9 @@ * 镇名 */ private String townName; /** * 年份 */ private String year; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -40,6 +40,7 @@ @Service @AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService { private final IFlowClient flowClient; private final IPatrolRecordService patrolRecordService; @@ -153,7 +154,9 @@ variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser)); // 完成任务 flowClient.completeTask(taskId,processInstanceId,comment,variables); //保存巡查记录 patrolRecordService.saveBatch(patrolTask.getPatrolRecordList()); //保存上报 saveReport(patrolTask); return baseMapper.updateById(patrolTask) >0; }else { @@ -276,7 +279,7 @@ } @Transactional(rollbackFor = Exception.class) public void saveReport(PatrolTask patrolTask){ //拿到当前任务下的异常巡查记录 PatrolRecord patrolRecord = new PatrolRecord();
