Skip to content

J
jfV5portal
Commit 9d267701 by 周添尉
Options

网盘修改了选择人员的模块

parents feb9ba12 69d0fe7e
Showing with 133 additions and 103 deletions
WebContent/jfcas04/css/common.css
......@@ -1177,7 +1177,7 @@ a{
line-height: 28px;
padding-left:6px;
color:#bbb;
width:70%;
width:85%;
}
.disk_move_search>span{
border:1px solid #f2f2f2;
......@@ -1185,8 +1185,8 @@ a{
line-height: 28px;
color:#333;
display: inline-block;
width:25%;
margin-left:5%;
width:13%;
margin-left:2%;
vertical-align: bottom;
text-align:center;
cursor: pointer;
......@@ -1229,7 +1229,7 @@ a{
margin-left: 10px;
}
.disk_move_tree li span.button.ico_close,.disk_move_tree li span.button.ico_open,.disk_move_tree li span.button.ico_docu{
background-size: cover !important;
background-size: 100% 100% !important;
width: 23px !important;
height: 17px !important;
vertical-align: text-bottom !important;
......@@ -1247,6 +1247,9 @@ a{
padding-top:0px !important;
padding-left:4px !important;
border-radius: 3px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ztree li span.button.noline_close{
background-image: url(../../custom/images/disk_move_tree_expand_gray.png) !important;
......@@ -1511,6 +1514,106 @@ a{
.disk_createShare_content>div>div{
padding:0px;
}
/***************选择人员的样式*********************/
.disk_selectUser_content{
padding:0;
}
.disk_selectUser_content>div{
padding:0;
height:600px;
}
.disk_selectUser_content>div:first-child{
border-right:1px solid #e5e5e5;
overflow: auto;
}
.disk_selectUser_content>div:first-child>div:first-child>img{
margin-top:200px;
width:100%;
}
.disk_selectUser_table_title+div{
text-align: center;
}
.disk_selectUser_table_title+div>img{
width: 34%;
margin-top: 147px;
}
.disk_selectUser_table_title{
height:50px;
background: #f9f9f9;
padding-left:15px;
padding-top:10px;
border-bottom:1px solid #e5e5e5;
}
.disk_selectUser_table_title>input{
height:30px;
width:200px;
display: inline;
padding-left:7px;
}
.disk_selectUser_table_title>span{
margin-left: 15px;
background: #50B6FF;
padding: 0px 14px;
height: 30px;
line-height: 30px;
vertical-align: top;
display: inline-block;
color: white;
border-radius: 4px;
cursor: pointer;
}
.disk_selectUser_table_title>span:hover{
background: #93D5FF;
}
.disk_selectUser_table_title>label{
color:red;
margin-left:15px;
display: none;
}
/*******************选择人员的表格***************/
.disk_selectUser_table{
padding:10px;
}
.disk_selectUser_table .fixed-table-body{
height: 411px;
}
.disk_selectUser_table table{
font-size:14px;
}
.disk_selectUser_table .pagination>.active>a,
.disk_selectUser_table .pagination>.active>a:focus,
.disk_selectUser_table .pagination>.active>a:hover,
.disk_selectUser_table .pagination>.active>span,
.disk_selectUser_table .pagination>.active>span:focus,
.disk_selectUser_table .pagination>.active>span:hover{
background: #50B6FF;
border-color: #50B6FF;
color:white;
}
.disk_selectUser_table .pagination>li>a:focus,
.disk_selectUser_table .pagination>li>a:hover,
.disk_selectUser_table .pagination>li>span:focus,
.disk_selectUser_table .pagination>li>span:hover,
.disk_selectUser_table .pagination>li>a,
.disk_selectUser_table .pagination>li>span{
color:#666
}
.disk_selectUser_table .btn-default:hover,
.disk_selectUser_table .btn-default.active,
.disk_selectUser_table .btn-default:active,
.disk_selectUser_table .open>.dropdown-toggle.btn-default{
background-color: #eee;
border-color: #ddd;
}
.disk_selectUser_table .dropdown-menu>.active>a,
.disk_selectUser_table .dropdown-menu>.active>a:focus,
.disk_selectUser_table .dropdown-menu>.active>a:hover{
background-color:#50B6FF;
}
.disk_selectUser_table .fixed-table-container input[type="radio"],
.disk_selectUser_table .fixed-table-container input[type="checkbox"]{
margin: 3px auto !important;
}
/*******************分享的样式*******************/
.share_cotainer{
width:400px;
......
WebContent/jfcas04/disk.jsp
......@@ -9,7 +9,7 @@
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/store/js/storeModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storeshare/js/storeShareModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/user/js/jwAppUserModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/userchoice/js/userchoiceModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepartook/js/storePartookModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/disk.js"></script>
</head>
......@@ -59,85 +59,8 @@
<div class="col-md-1"><span onclick="disk_content_toggle(this)" class="disk_content_toggleBtn glyphicon glyphicon-th-large" title="切换到列表模式"></span></div>
</div>
<!-- 缩略图 -->
<div class="col-md-12 disk_content_lump">
<%-- <div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_module1.png"/>
<div>公司文件</div>
<input style="display:none;" type="text" class="form-control" value="公司文件"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_module2.png"/>
<div>共享文件</div>
<input style="display:none;" type="text" class="form-control" value="共享文件"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_module3.png"/>
<div>我的文件</div>
<input style="display:none;" type="text" class="form-control" value="我的文件"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_module4.png"/>
<div>我的共享</div>
<input style="display:none;" type="text" class="form-control" value="我的共享"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_rar.png"/>
<div>压缩文件夹</div>
<input style="display:none;" type="text" class="form-control" value="压缩文件夹"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_word.png"/>
<div>我的文档</div>
<input style="display:none;" type="text" class="form-control" value="我的文档"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_excel.png"/>
<div>我的EXCEL</div>
<input style="display:none;" type="text" class="form-control" value="我的EXCEL"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_ppt.png"/>
<div>我的PPT</div>
<input style="display:none;" style="display:none;" type="text" class="form-control" value="我的PPT"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_pdf.png"/>
<div>我的PDF</div>
<input style="display:none;" type="text" class="form-control" value="我的PDF"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_uploadImg.png"/>
<div>超级狙击手.png</div>
<input style="display:none;" type="text" class="form-control" value="超级狙击手.png"/>
</div>
</div>
<div class="col-md-2">
<div>
<img src="${ctx}/custom/images/disk_unknow.png"/>
<div>disk_unknow.bsl</div>
<input style="display:none;" type="text" class="form-control" value="disk_unknow.bsl"/>
</div>
</div> --%>
</div>
<div class="col-md-12 disk_content_lump"></div>
<!-- 列表 -->
<div class="disk_content_list disk_table disk_table_height" style="display:none;margin-bottom:20px;" >
<table id="disk_content_list"></table>
......
src_jwapp/com/jw/app/business/attendance/AttendanceBusinessImpl.java
......@@ -39,7 +39,7 @@ public class AttendanceBusinessImpl implements AttendanceBusiness {
entity.put("USER_ID", SessionUtil.getEmid());
}
if(entity.get("USER_NAME")==null){
entity.put("USER_NAME", SessionUtil.getEmname());
entity.put("USER_NAME", SessionUtil.getCode());
}
if(entity.get("DEPT_ID")==null){
entity.put("DEPT_ID", SessionUtil.getEmdepart());
......
src_jwapp/com/jw/app/business/bgmk/BgmkBusinessImpl.java
......@@ -38,7 +38,7 @@ public class BgmkBusinessImpl implements BgmkBusiness {
entity.put("CREATE_TIME", new Date());
}
if(entity.get("USER_NAME")==null){
entity.put("USER_NAME", SessionUtil.getEmname());
entity.put("USER_NAME", SessionUtil.getCode());
}
if(entity.get("CREATOR_ID")==null){
entity.put("CREATOR_ID", SessionUtil.getCode());
......
src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.jw.app.business.bgmk.bgmkDAO">
<insert id="insert_bgmk" parameterType="map">
insert into C_T_WORK_BG(
insert into WORK_BG(
<trim prefix="" suffixOverrides=",">
<foreach collection="infoListKey" item="key">
${key},
......@@ -20,7 +20,7 @@
<update id="update_bgmk" parameterType="map">
<![CDATA[
update C_T_WORK_BG set
update WORK_BG set
]]>
<trim prefix="" suffixOverrides=",">
<foreach collection="info" item="info">
......@@ -36,7 +36,7 @@
<delete id="delete_bgmk" parameterType="list">
<![CDATA[
delete from C_T_WORK_BG where UUID IN
delete from WORK_BG where UUID IN
]]>
<foreach collection="list" item="UUID" open="(" separator=","
close=")">
......@@ -47,7 +47,7 @@
<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select f.*
from C_T_WORK_BG f where 1=1
from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -92,7 +92,7 @@
<select id="listCount_bgmk" parameterType="map" resultType="int">
<![CDATA[
select count(*) c from C_T_WORK_BG f where 1=1
select count(*) c from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -137,7 +137,7 @@
<select id="list_bgmk_employee" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select f.*
from C_T_WORK_BG f where 1=1
from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -182,7 +182,7 @@
<select id="listCount_bgmk_employee" parameterType="map" resultType="int">
<![CDATA[
select count(*) c from C_T_WORK_BG f where 1=1
select count(*) c from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......
src_jwapp/com/jw/app/business/friendlink/FriendLinkBusinessImpl.java
package com.jw.app.business.friendlink;
import java.text.BreakIterator;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
......@@ -61,6 +62,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
int count = friendlinkDAO.list_count_friendlink(query);
if(count>=8){
info.put("ERROR", "-1");
throw new BusinessException("");
}
// 表示新增
info.put("UUID", UUID.randomUUID().toString());
......
src_jwapp/com/jw/app/business/friendlink/friendlinkDAO.xml
......@@ -22,7 +22,7 @@
<select id="list_friendlink" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select * from b_t_ufp_friendlink t
select * from friendlink t
]]>
<include refid="where" />
ORDER BY t.sort
......@@ -30,14 +30,14 @@
<select id="list_count_friendlink" parameterType="map" resultType="int">
<![CDATA[
select count(*) from b_t_ufp_friendlink t
select count(*) from friendlink t
]]>
<include refid="where" />
ORDER BY t.sort
</select>
<insert id="insert_friendlink" parameterType="java.util.List">
insert into b_t_ufp_friendlink(
insert into friendlink(
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key},
......@@ -53,7 +53,7 @@
</insert>
<update id="update_friendlink" parameterType="java.util.List">
update b_t_ufp_friendlink set
update friendlink set
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key}=#{field.value},
......@@ -63,6 +63,6 @@
</update>
<delete id="delete_friendlink" parameterType="String">
delete from b_t_ufp_friendlink where UUID=#{uuid}
delete from friendlink where UUID=#{uuid}
</delete>
</mapper>
\ No newline at end of file
src_jwapp/com/jw/app/business/notice/noticeDAO.xml
......@@ -22,7 +22,7 @@
<select id="list_notice" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select * from b_t_ufp_notice t
select * from notice t
]]>
<include refid="where" />
ORDER BY t.CREATE_TIME
......@@ -30,14 +30,14 @@
<select id="list_count_notice" parameterType="map" resultType="int">
<![CDATA[
select count(*) from b_t_ufp_notice t
select count(*) from notice t
]]>
<include refid="where" />
ORDER BY t.CREATE_TIME
</select>
<insert id="insert_notice" parameterType="java.util.List">
insert into b_t_ufp_notice(
insert into notice(
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key},
......@@ -53,7 +53,7 @@
</insert>
<update id="update_notice" parameterType="java.util.List">
update b_t_ufp_notice set
update notice set
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key}=#{field.value},
......@@ -63,6 +63,6 @@
</update>
<delete id="delete_notice" parameterType="String">
delete from b_t_ufp_notice where UUID=#{uuid}
delete from notice where UUID=#{uuid}
</delete>
</mapper>
\ No newline at end of file
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