Commit fc84fac0 authored by 赵啸非's avatar 赵啸非

添加窗口编码

parent 7f450eda
package com.mortals.xhx.module.window.model; package com.mortals.xhx.module.window.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -11,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; ...@@ -11,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.vo.WindowPerformVo; import com.mortals.xhx.module.window.model.vo.WindowPerformVo;
import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
import lombok.Data; import lombok.Data;
/** /**
* 窗口考核登记实体对象 * 窗口考核登记实体对象
...@@ -131,17 +129,6 @@ public class WindowPerformEntity extends WindowPerformVo { ...@@ -131,17 +129,6 @@ public class WindowPerformEntity extends WindowPerformVo {
* 窗口编号 * 窗口编号
*/ */
private String windowCode; private String windowCode;
/**
* 窗口人员考核汇总明细信息
*/
private List<WindowWorkmanPerformDetailEntity> windowWorkmanPerformDetailList=new ArrayList<>();;
public List<WindowWorkmanPerformDetailEntity> getWindowWorkmanPerformDetailList(){
return windowWorkmanPerformDetailList;
}
public void setWindowWorkmanPerformDetailList(List<WindowWorkmanPerformDetailEntity> windowWorkmanPerformDetailList){
this.windowWorkmanPerformDetailList = windowWorkmanPerformDetailList;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
......
package com.mortals.xhx.module.window.model; package com.mortals.xhx.module.window.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.window.model.WindowPerformEntity; import com.mortals.xhx.module.window.model.WindowPerformEntity;
......
...@@ -37,26 +37,7 @@ ...@@ -37,26 +37,7 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="windowCode" column="windowCode" /> <result property="windowCode" column="windowCode" />
<collection property="windowWorkmanPerformDetailList" column="id" ofType="WindowWorkmanPerformDetailEntity" javaType="ArrayList" select="getWindowWorkmanPerformDetailByPerformId"></collection>
</resultMap>
<resultMap type="WindowWorkmanPerformDetailEntity" id="WindowWorkmanPerformDetailEntity-Map">
<result property="id" column="id" />
<result property="performId" column="performId" />
<result property="staffId" column="staffId" />
<result property="staffName" column="staffName" />
<result property="discipline" column="discipline" />
<result property="specification" column="specification" />
<result property="management" column="management" />
<result property="evaluation" column="evaluation" />
<result property="efficiency" column="efficiency" />
<result property="bonusScore" column="bonusScore" />
<result property="sumScore" column="sumScore" />
<result property="examineLevel" column="examineLevel" />
<result property="remark" column="remark" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
...@@ -161,12 +142,6 @@ ...@@ -161,12 +142,6 @@
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowPerformEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="WindowPerformEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_window_perform insert into mortals_xhx_window_perform
...@@ -693,14 +668,6 @@ ...@@ -693,14 +668,6 @@
</trim> </trim>
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 -->
<select id="getWindowWorkmanPerformDetailByPerformId" parameterType="java.lang.Long" resultMap="WindowWorkmanPerformDetailEntity-Map">
select <include refid="_columns_sub"/>
from mortals_xhx_window_workman_perform_detail as b
<trim suffixOverrides="where" suffix="">
where b.performId = #{id}
</trim>
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment