Commit b40513cf authored by 耿迪迪's avatar 耿迪迪

结算时间-操作记录排序-消息标题省略

parent 50f60a9f
......@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -164,6 +165,7 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
settlementTrade.settleAbleAmount(tradeInfo);
tradeInfo.setTradeStatus(tTradeProject.getTradeStatus());
tradeInfo.setApplyDeptManagerId(tTradeProject.getApplyDeptManagerId());
tradeInfo.setSettlementTime(new Date());
return tTradeProjectMapper.updateTTradeProject(tradeInfo);
}
......
......@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operateTime != null "> and operate_time = #{operateTime}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
</where>
ORDER BY operate_time DESC
</select>
<select id="selectTCashOperateById" parameterType="Long" resultMap="TCashOperateResult">
......
......@@ -69,6 +69,12 @@
text-overflow: ellipsis;
overflow: hidden;
}
.region-item-style:hover {
white-space: normal; /* 显示全部 */
overflow: visible; /* 取消超出隐藏 */
max-width: none; /* 取消最大宽度 */
}
</style>
<style scoped lang="scss">
......
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