server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
@@ -22,10 +22,10 @@ private Integer rootDepartId; @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date startDate; private String startDate; @ApiModelProperty(value = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; private String endDate; @ApiModelProperty(value = "数据权限部门编码集合" ,hidden = true) private List<Integer> departIds; server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -478,11 +478,11 @@ <if test="userId != null"> AND `CREATE_USER` = #{userId} </if> <if test="startDate != null"> AND `CREATE_TIME` >= #{startDate} <if test="startDate != null and startDate != ''"> AND `CREATE_TIME` >= concat(#{startDate},' 00:00:00') </if> <if test="endDate != null"> AND #{endDate} >= `CREATE_TIME` AND concat(#{endDate},' 23:59:59') >= `CREATE_TIME` </if> group by `CREATE_USER` <!-- order by `CREATE_TIME` desc-->