Skip to content

A
attendance-performance-platform
Commit a40e7a05 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加窗口编码

parent cfcdda10
Show whitespace changes
Inline Side-by-side
Showing with 212 additions and 11 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowPerformEntity.java
View file @ a40e7a05
......@@ -17,7 +17,7 @@ import lombok.Data;
* 窗口考核登记实体对象
*
* @author zxfei
* @date 2024-01-26
* @date 2024-01-27
*/
@Data
public class WindowPerformEntity extends WindowPerformVo {
......@@ -127,6 +127,10 @@ public class WindowPerformEntity extends WindowPerformVo {
* 填报状态0暂存1提交
*/
private Integer fillStatus;
/**
* 窗口编号
*/
private String windowCode;
/**
* 窗口人员考核汇总明细信息
*/
......@@ -181,5 +185,6 @@ public class WindowPerformEntity extends WindowPerformVo {
this.annexUrl = "";
this.fillDate = new Date();
this.fillStatus = 0;
this.windowCode = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowPerformQuery.java
View file @ a40e7a05
......@@ -9,7 +9,7 @@ import com.mortals.xhx.module.window.model.WindowPerformEntity;
* 窗口考核登记查询对象
*
* @author zxfei
* @date 2024-01-26
* @date 2024-01-27
*/
public class WindowPerformQuery extends WindowPerformEntity {
/** 开始 序号，主键，自增长 */
......@@ -330,6 +330,11 @@ public class WindowPerformQuery extends WindowPerformEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 窗口编号 */
private List<String> windowCodeList;
/** 窗口编号排除列表 */
private List <String> windowCodeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WindowPerformQuery> orConditionList;
......@@ -2114,6 +2119,38 @@ public class WindowPerformQuery extends WindowPerformEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 窗口编号
* @return windowCodeList
*/
public List<String> getWindowCodeList(){
return this.windowCodeList;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public void setWindowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
}
/**
* 获取 窗口编号
* @return windowCodeNotList
*/
public List<String> getWindowCodeNotList(){
return this.windowCodeNotList;
}
/**
* 设置 窗口编号
* @param windowCodeNotList
*/
public void setWindowCodeNotList(List<String> windowCodeNotList){
this.windowCodeNotList = windowCodeNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -3209,6 +3246,25 @@ public class WindowPerformQuery extends WindowPerformEntity {
}
/**
* 设置 窗口编号
* @param windowCode
*/
public WindowPerformQuery windowCode(String windowCode){
setWindowCode(windowCode);
return this;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public WindowPerformQuery windowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowWorkmanPerformEntity.java
View file @ a40e7a05
......@@ -82,6 +82,10 @@ public class WindowWorkmanPerformEntity extends WindowWorkmanPerformVo {
* 填报状态0暂存1提交
*/
private Integer fillStatus;
/**
* 窗口编号
*/
private String windowCode;
/**
* 窗口人员考核汇总明细信息
*/
......@@ -125,5 +129,6 @@ public class WindowWorkmanPerformEntity extends WindowWorkmanPerformVo {
this.annexUrl = "";
this.fillDate = new Date();
this.fillStatus = 0;
this.windowCode = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowWorkmanPerformQuery.java
View file @ a40e7a05
......@@ -214,6 +214,11 @@ public class WindowWorkmanPerformQuery extends WindowWorkmanPerformEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 窗口编号 */
private List<String> windowCodeList;
/** 窗口编号排除列表 */
private List <String> windowCodeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WindowWorkmanPerformQuery> orConditionList;
......@@ -1352,6 +1357,38 @@ public class WindowWorkmanPerformQuery extends WindowWorkmanPerformEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 窗口编号
* @return windowCodeList
*/
public List<String> getWindowCodeList(){
return this.windowCodeList;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public void setWindowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
}
/**
* 获取 窗口编号
* @return windowCodeNotList
*/
public List<String> getWindowCodeNotList(){
return this.windowCodeNotList;
}
/**
* 设置 窗口编号
* @param windowCodeNotList
*/
public void setWindowCodeNotList(List<String> windowCodeNotList){
this.windowCodeNotList = windowCodeNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2028,6 +2065,25 @@ public class WindowWorkmanPerformQuery extends WindowWorkmanPerformEntity {
}
/**
* 设置 窗口编号
* @param windowCode
*/
public WindowWorkmanPerformQuery windowCode(String windowCode){
setWindowCode(windowCode);
return this;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public WindowWorkmanPerformQuery windowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
View file @ a40e7a05
......@@ -226,7 +226,6 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
}
});
return Rest.ok(dateList);
}
......
attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowPerformMapper.xml
View file @ a40e7a05
......@@ -36,6 +36,7 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="windowCode" column="windowCode" />
<collection property="windowWorkmanPerformDetailList" column="id" ofType="WindowWorkmanPerformDetailEntity" javaType="ArrayList" select="getWindowWorkmanPerformDetailByPerformId"></collection>
</resultMap>
<resultMap type="WindowWorkmanPerformDetailEntity" id="WindowWorkmanPerformDetailEntity-Map">
......@@ -155,6 +156,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowCode') or colPickMode == 1 and data.containsKey('windowCode')))">
a.windowCode,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
......@@ -166,18 +170,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowPerformEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_window_perform
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,workSummary,bonusReport,proof,proofUrl,deductStatement,deductScore,discipline,specification,bonusScore,sumScore,selfLevel,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime)
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,workSummary,bonusReport,proof,proofUrl,deductStatement,deductScore,discipline,specification,bonusScore,sumScore,selfLevel,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime,windowCode)
VALUES
(#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{workSummary},#{bonusReport},#{proof},#{proofUrl},#{deductStatement},#{deductScore},#{discipline},#{specification},#{bonusScore},#{sumScore},#{selfLevel},#{remark},#{annex},#{annexUrl},#{fillDate},#{fillStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{workSummary},#{bonusReport},#{proof},#{proofUrl},#{deductStatement},#{deductScore},#{discipline},#{specification},#{bonusScore},#{sumScore},#{selfLevel},#{remark},#{annex},#{annexUrl},#{fillDate},#{fillStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{windowCode})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_window_perform
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,workSummary,bonusReport,proof,proofUrl,deductStatement,deductScore,discipline,specification,bonusScore,sumScore,selfLevel,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime)
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,workSummary,bonusReport,proof,proofUrl,deductStatement,deductScore,discipline,specification,bonusScore,sumScore,selfLevel,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime,windowCode)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.workSummary},#{item.bonusReport},#{item.proof},#{item.proofUrl},#{item.deductStatement},#{item.deductScore},#{item.discipline},#{item.specification},#{item.bonusScore},#{item.sumScore},#{item.selfLevel},#{item.remark},#{item.annex},#{item.annexUrl},#{item.fillDate},#{item.fillStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.workSummary},#{item.bonusReport},#{item.proof},#{item.proofUrl},#{item.deductStatement},#{item.deductScore},#{item.discipline},#{item.specification},#{item.bonusScore},#{item.sumScore},#{item.selfLevel},#{item.remark},#{item.annex},#{item.annexUrl},#{item.fillDate},#{item.fillStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.windowCode})
</foreach>
</insert>
......@@ -322,6 +326,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('windowCode')) or (colPickMode==1 and !data.containsKey('windowCode'))">
a.windowCode=#{data.windowCode},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -619,6 +626,13 @@
</if>
</foreach>
</trim>
<trim prefix="windowCode=(case" suffix="ELSE windowCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('windowCode')) or (colPickMode==1 and !item.containsKey('windowCode'))">
when a.id=#{item.id} then #{item.windowCode}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1472,6 +1486,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('windowCode')">
<if test="conditionParamRef.windowCode != null and conditionParamRef.windowCode != ''">
${_conditionType_} a.windowCode like #{${_conditionParam_}.windowCode}
</if>
<if test="conditionParamRef.windowCode == null">
${_conditionType_} a.windowCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('windowCodeList') and conditionParamRef.windowCodeList.size() > 0">
${_conditionType_} a.windowCode in
<foreach collection="conditionParamRef.windowCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowCodeNotList') and conditionParamRef.windowCodeNotList.size() > 0">
${_conditionType_} a.windowCode not in
<foreach collection="conditionParamRef.windowCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1864,6 +1899,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('windowCode')">
a.windowCode
<if test='orderCol.windowCode != null and "DESC".equalsIgnoreCase(orderCol.windowCode)'>DESC</if>
,
</if>
</trim>
</if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowWorkmanPerformMapper.xml
View file @ a40e7a05
......@@ -25,6 +25,7 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="windowCode" column="windowCode" />
<collection property="windowWorkmanPerformDetailList" column="id" ofType="WindowWorkmanPerformDetailEntity" javaType="ArrayList" select="getWindowWorkmanPerformDetailByPerformId"></collection>
</resultMap>
<resultMap type="WindowWorkmanPerformDetailEntity" id="WindowWorkmanPerformDetailEntity-Map">
......@@ -111,6 +112,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowCode') or colPickMode == 1 and data.containsKey('windowCode')))">
a.windowCode,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
......@@ -122,18 +126,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowWorkmanPerformEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_window_workman_perform
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime)
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime,windowCode)
VALUES
(#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{remark},#{annex},#{annexUrl},#{fillDate},#{fillStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{remark},#{annex},#{annexUrl},#{fillDate},#{fillStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{windowCode})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_window_workman_perform
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime)
(year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,remark,annex,annexUrl,fillDate,fillStatus,createUserId,createTime,updateUserId,updateTime,windowCode)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.remark},#{item.annex},#{item.annexUrl},#{item.fillDate},#{item.fillStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.remark},#{item.annex},#{item.annexUrl},#{item.fillDate},#{item.fillStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.windowCode})
</foreach>
</insert>
......@@ -227,6 +231,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('windowCode')) or (colPickMode==1 and !data.containsKey('windowCode'))">
a.windowCode=#{data.windowCode},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -417,6 +424,13 @@
</if>
</foreach>
</trim>
<trim prefix="windowCode=(case" suffix="ELSE windowCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('windowCode')) or (colPickMode==1 and !item.containsKey('windowCode'))">
when a.id=#{item.id} then #{item.windowCode}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1003,6 +1017,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('windowCode')">
<if test="conditionParamRef.windowCode != null and conditionParamRef.windowCode != ''">
${_conditionType_} a.windowCode like #{${_conditionParam_}.windowCode}
</if>
<if test="conditionParamRef.windowCode == null">
${_conditionType_} a.windowCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('windowCodeList') and conditionParamRef.windowCodeList.size() > 0">
${_conditionType_} a.windowCode in
<foreach collection="conditionParamRef.windowCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowCodeNotList') and conditionParamRef.windowCodeNotList.size() > 0">
${_conditionType_} a.windowCode not in
<foreach collection="conditionParamRef.windowCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1256,6 +1291,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('windowCode')">
a.windowCode
<if test='orderCol.windowCode != null and "DESC".equalsIgnoreCase(orderCol.windowCode)'>DESC</if>
,
</if>
</trim>
</if>
......
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