ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
@@ -28,7 +28,7 @@ /** 考核范围 1/2 分局/市局 */ @Excel(name = "考核范围 1/2 分局/市局") private Long timeRange; private Long examineRange; /** 考核频率 1/2 月度考核/季度考核 */ @Excel(name = "考核频率 1/2 月度考核/季度考核") @@ -38,12 +38,12 @@ @Excel(name = "考核状态 0/1 启用 / 停用") private Long state; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long createUser; @Excel(name = "创建人") private String createUserName; @Excel(name = "修改人") private String updateUserName; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long updateUser; /** 描述 */ @@ -77,12 +77,28 @@ return templateId; } public Long getTimeRange() { return timeRange; public Long getExamineRange() { return examineRange; } public void setTimeRange(Long timeRange) { this.timeRange = timeRange; public void setExamineRange(Long examineRange) { this.examineRange = examineRange; } public String getCreateUserName() { return createUserName; } public void setCreateUserName(String createUserName) { this.createUserName = createUserName; } public String getUpdateUserName() { return updateUserName; } public void setUpdateUserName(String updateUserName) { this.updateUserName = updateUserName; } public void setFrequency(Long frequency) @@ -137,10 +153,12 @@ "id=" + id + ", examineName='" + examineName + '\'' + ", templateId=" + templateId + ", timeRange=" + timeRange + ", examineRange=" + examineRange + ", frequency=" + frequency + ", state=" + state + ", createUser=" + createUser + ", createUserName='" + createUserName + '\'' + ", updateUserName='" + updateUserName + '\'' + ", updateUser=" + updateUser + ", description='" + description + '\'' + '}'; ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,5 +1,6 @@ package com.ycl.platform.service.impl; import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.CheckTemplate; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.mapper.CheckTemplateMapper; @@ -144,9 +145,14 @@ @Override public Result all() { List<CheckTemplate> entities = baseMapper.selectList(null); List<CheckTemplateVO> vos = entities.stream() List<BaseSelect> vos = entities.stream() .map( entity -> CheckTemplateVO.getVoByEntity(entity, null) entity -> { BaseSelect baseSelect = new BaseSelect(); baseSelect.setId(entity.getId()); baseSelect.setValue(entity.getTemplateName()); return baseSelect; } ) .collect(Collectors.toList()); return Result.ok().data(vos); ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java
@@ -3,10 +3,15 @@ import com.ycl.platform.domain.entity.TCheckPublish; import com.ycl.platform.mapper.TCheckPublishMapper; import com.ycl.platform.service.ITCheckPublishService; import com.ycl.system.entity.SysUser; import com.ycl.system.mapper.SysUserMapper; import com.ycl.system.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import utils.DateUtils; import java.util.Date; import java.util.List; /** @@ -20,7 +25,8 @@ { @Autowired private TCheckPublishMapper tCheckPublishMapper; @Autowired private SysUserMapper userMapper; /** * 查询考核发布 * @@ -54,7 +60,14 @@ @Override public int insertTCheckPublish(TCheckPublish tCheckPublish) { tCheckPublish.setCreateTime(DateUtils.getNowDate()); Date nowDate = DateUtils.getNowDate(); tCheckPublish.setCreateTime(nowDate); tCheckPublish.setUpdateTime(nowDate); LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); tCheckPublish.setCreateUser(user.getUserId()); tCheckPublish.setCreateUserName(user.getUsername()); tCheckPublish.setUpdateUser(user.getUserId()); tCheckPublish.setUpdateUserName(user.getUsername()); return tCheckPublishMapper.insertTCheckPublish(tCheckPublish); } @@ -68,6 +81,9 @@ public int updateTCheckPublish(TCheckPublish tCheckPublish) { tCheckPublish.setUpdateTime(DateUtils.getNowDate()); LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); tCheckPublish.setUpdateUser(user.getUserId()); tCheckPublish.setUpdateUserName(user.getUsername()); return tCheckPublishMapper.updateTCheckPublish(tCheckPublish); }
@@ -8,18 +8,20 @@ <result property="id" column="id" /> <result property="examineName" column="examine_name" /> <result property="templateId" column="template_id" /> <result property="timeRange" column="time_range" /> <result property="examineRange" column="examine_range" /> <result property="frequency" column="frequency" /> <result property="state" column="state" /> <result property="createTime" column="create_time" /> <result property="createUser" column="create_user" /> <result property="createUserName" column="create_user_name" /> <result property="updateTime" column="update_time" /> <result property="updateUser" column="update_user" /> <result property="updateUserName" column="update_user_name" /> <result property="description" column="description" /> </resultMap> <sql id="selectTCheckPublishVo"> select id , examine_name, template_id , time_range , frequency , state , create_time , create_user , update_time , update_user , description from t_check_publish select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name from t_check_publish </sql> <select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult"> @@ -27,7 +29,7 @@ <where> <if test="templateId != null "> and template_id = #{templateId}</if> <if test="examineName != null and examineName != '' "> and examine_name = #{examineName}</if> <if test="timeRange != null "> and time_range = #{timeRange}</if> <if test="examineRange != null "> and examine_range = #{examineRange}</if> <if test="frequency != null "> and frequency = #{frequency}</if> <if test="state != null "> and state = #{state}</if> <if test="createUser != null "> and create_user = #{createUser}</if> @@ -47,26 +49,30 @@ <if test="id != null">id,</if> <if test="examineName != null and examineName != ''">examine_name,</if> <if test="templateId != null">template_id,</if> <if test="timeRange != null">time_range,</if> <if test="examineRange != null">examine_range,</if> <if test="frequency != null">frequency,</if> <if test="state != null">state,</if> <if test="createTime != null">create_time,</if> <if test="createUser != null">create_user,</if> <if test="createUserName != null and createUserName!= ''">create_user_name,</if> <if test="updateTime != null">update_time,</if> <if test="updateUser != null">update_user,</if> <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if> <if test="description != null">description,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> <if test="examineName != null and examineName != ''">#{examineName},</if> <if test="templateId != null">#{templateId},</if> <if test="timeRange != null">#{timeRange},</if> <if test="examineRange != null">#{examineRange},</if> <if test="frequency != null">#{frequency},</if> <if test="state != null">#{state},</if> <if test="createTime != null">#{createTime},</if> <if test="createUser != null">#{createUser},</if> <if test="createUserName != null and createUserName!= ''">#{createUserName},</if> <if test="updateTime != null">#{updateTime},</if> <if test="updateUser != null">#{updateUser},</if> <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if> <if test="description != null">#{description},</if> </trim> </insert> @@ -76,13 +82,15 @@ <trim prefix="SET" suffixOverrides=","> <if test="examineName != null and examineName != ''">examine_name = #{examineName},</if> <if test="templateId != null">template_id = #{templateId},</if> <if test="timeRange != null">time_range = #{timeRange},</if> <if test="examineRange != null">examine_range = #{examineRange},</if> <if test="frequency != null">frequency = #{frequency},</if> <if test="state != null">state = #{state},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="createUser != null">create_user = #{createUser},</if> <if test="createUserName != null and createUserName!= ''">create_user_name = #{createUserName},</if> <if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateUser != null">update_user = #{updateUser},</if> <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if> <if test="description != null">description = #{description},</if> </trim> where id = #{id}
