wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-10-21 17:04:56 +08:00
parent 9d34f16065
commit 6e73c4da7d
6 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java
View File

@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lz.modules.flow.entity.FlowStart;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface FlowStartMapper extends BaseMapper<FlowStart> {
@ -29,5 +32,6 @@ public interface FlowStartMapper extends BaseMapper<FlowStart> {
int deleteFlowStartById(@Param("id")Long id);
List<FlowStart> selectListByTime();
}

30
src/main/java/com/lz/modules/flow/entity/FlowStart.java
View File

@ -8,10 +8,9 @@ import lombok.Data;
import java.util.Date;
/**
* <p>
* 菜单权限表
* </p>*发起考核表
* @author quyixiao
* @since 2020-10-13
* @since 2020-10-21
*/
@Data
@ -40,8 +39,11 @@ public class FlowStart implements java.io.Serializable {
@ApiModelProperty(value = "结束时间", name = "endTime")
private Date endTime;
//组id
@ApiModelProperty(value = "组id,逗号隔开", name = "groupIds")
private String groupIds;
@ApiModelProperty(value = "组id", name = "groupIds")
private Long groupIds;
//考核名称
@ApiModelProperty(value = "考核名称", name = "name")
private String name;
/**
*
* @return
@ -151,17 +153,32 @@ public class FlowStart implements java.io.Serializable {
* 组id
* @return
*/
public String getGroupIds() {
public Long getGroupIds() {
return groupIds;
}
/**
* 组id
* @param groupIds
*/
public void setGroupIds(String groupIds) {
public void setGroupIds(Long groupIds) {
this.groupIds = groupIds;
}
/**
* 考核名称
* @return
*/
public String getName() {
return name;
}
/**
* 考核名称
* @param name
*/
public void setName(String name) {
this.name = name;
}
@Override
public String toString() {
return "FlowStart{" +
@ -173,6 +190,7 @@ public class FlowStart implements java.io.Serializable {
",startTime=" + startTime +
",endTime=" + endTime +
",groupIds=" + groupIds +
",name=" + name +
"}";
}
}

3
src/main/java/com/lz/modules/flow/service/FlowStartService.java
View File

@ -3,6 +3,8 @@ package com.lz.modules.flow.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.modules.flow.entity.FlowStart;
import java.util.List;
/**
* <p>
* 发起考核表 服务类
@ -30,4 +32,5 @@ public interface FlowStartService extends IService<FlowStart> {
int deleteFlowStartById(Long id);
}

3
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -1,6 +1,7 @@
package com.lz.modules.performance.controller;
import com.lz.common.utils.R;
import com.lz.modules.flow.dao.FlowStartMapper;
import com.lz.modules.flow.service.FlowStartService;
import com.lz.modules.performance.req.AssessDetailReq;
import com.lz.modules.performance.req.AssessListReq;
@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
public class AssessManagerController {
@Autowired
private FlowStartService flowStartService;
private FlowStartMapper flowStartMapper;
@RequestMapping("assess/manager/list")

49
src/main/resources/mapper/flow/FlowStartMapper.xml
View File

@ -12,12 +12,13 @@
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
<result column="group_ids" property="groupIds"/>
<result column="name" property="name"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, cycle_type AS cycleType, start_time AS startTime, end_time AS endTime, group_ids AS groupIds
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, cycle_type AS cycleType, start_time AS startTime, end_time AS endTime, group_ids AS groupIds, name AS name
</sql>
@ -27,38 +28,40 @@
select * from lz_flow_start where id=#{id} and is_delete = 0 limit 1
</select>
<insert id="insertFlowStart" parameterType="FlowStart" useGeneratedKeys="true" keyProperty="id" >
insert into lz_flow_start(
<if test="cycleType != null">cycle_type, </if>
<if test="startTime != null">start_time, </if>
<if test="endTime != null">end_time, </if>
<if test="groupIds != null">group_ids, </if>
is_delete,
gmt_create,
gmt_modified
<if test="cycleType != null">cycle_type, </if>
<if test="startTime != null">start_time, </if>
<if test="endTime != null">end_time, </if>
<if test="groupIds != null">group_ids, </if>
<if test="name != null">name, </if>
is_delete,
gmt_create,
gmt_modified
)values(
<if test="cycleType != null">#{ cycleType}, </if>
<if test="startTime != null">#{ startTime}, </if>
<if test="endTime != null">#{ endTime}, </if>
<if test="groupIds != null">#{ groupIds}, </if>
0,
now(),
now()
<if test="cycleType != null">#{ cycleType}, </if>
<if test="startTime != null">#{ startTime}, </if>
<if test="endTime != null">#{ endTime}, </if>
<if test="groupIds != null">#{ groupIds}, </if>
<if test="name != null">#{ name}, </if>
0,
now(),
now()
)
</insert>
<update id="updateFlowStartById" parameterType="FlowStart" >
update
lz_flow_start
lz_flow_start
<trim prefix="set" suffixOverrides=",">
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="cycleType != null">cycle_type = #{cycleType},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="groupIds != null">group_ids = #{groupIds}</if>
<if test="groupIds != null">group_ids = #{groupIds},</if>
<if test="name != null">name = #{name}</if>
</trim>
,gmt_modified = now()
where id = #{id}
@ -67,14 +70,15 @@
<update id="updateCoverFlowStartById" parameterType="FlowStart" >
update
lz_flow_start
set
lz_flow_start
set
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
cycle_type = #{cycleType},
start_time = #{startTime},
end_time = #{endTime},
group_ids = #{groupIds}
group_ids = #{groupIds},
name = #{name}
,gmt_modified = now()
where id = #{id}
</update>
@ -84,5 +88,8 @@
update lz_flow_start set is_delete = 1 where id=#{id} limit 1
</update>
<select id="selectListByTime">
select * from lz_flow_start where is_delete = 0 and
</select>
</mapper>

2
src/test/java/com/lz/mysql/MysqlMain.java
View File

@ -78,7 +78,7 @@ public class MysqlMain {
//list.add(new TablesBean("lz_result_model"));
//list.add(new TablesBean("lz_result_score"));
//list.add(new TablesBean("lz_result_taget_lib"));
list.add(new TablesBean("lz_staff_role"));
list.add(new TablesBean("lz_flow_start"));
List<TablesBean> list2 = new ArrayList<TablesBean>();
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();