日程

web/src/main/java/com/jeesite/modules/sys/entity/schedule/Schedule.java

@@ -39,10 +39,11 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false),
 		@Column(name="update_by", attrName="updateBy", label="更新者", isQuery=false),
 		@Column(name="update_date", attrName="updateDate", label="更新时间", isQuery=false),
+		@Column(name="flg", attrName="flg", label="是否公共日程", isQuery=false),
 	}, orderBy="a.update_date DESC"
 )
 public class Schedule extends DataEntity<Schedule> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String fschedulename;		// 日程名称
 	private String fschedulecontent;		// 日程内容
@@ -60,15 +61,24 @@ public class Schedule extends DataEntity<Schedule> {
 	private Long fdeletemark;		// 删除标记
 	private Long fenabledmark;		// 有效标志
 	private String fdescription;		// 备注
-	
+	private Long flg;
+
+	public Long getFlg() {
+		return flg;
+	}
+
+	public void setFlg(Long flg) {
+		this.flg = flg;
+	}
+
 	public Schedule() {
 		this(null);
 	}
-	
+
 	public Schedule(String id){
 		super(id);
 	}
-	
+
 	@Size(min=0, max=255, message="日程名称长度不能超过 255 个字符")
 	public String getFschedulename() {
 		return fschedulename;
@@ -77,7 +87,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFschedulename(String fschedulename) {
 		this.fschedulename = fschedulename;
 	}
-	
+
 	@Size(min=0, max=200, message="日程内容长度不能超过 200 个字符")
 	public String getFschedulecontent() {
 		return fschedulecontent;
@@ -86,7 +96,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFschedulecontent(String fschedulecontent) {
 		this.fschedulecontent = fschedulecontent;
 	}
-	
+
 	@Size(min=0, max=50, message="类别长度不能超过 50 个字符")
 	public String getFcategory() {
 		return fcategory;
@@ -95,7 +105,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFcategory(String fcategory) {
 		this.fcategory = fcategory;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@NotNull(message="开始日期不能为空")
 	public Date getFstartdate() {
@@ -105,7 +115,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFstartdate(Date fstartdate) {
 		this.fstartdate = fstartdate;
 	}
-	
+
 	@Size(min=0, max=50, message="开始时间长度不能超过 50 个字符")
 	public String getFstarttime() {
 		return fstarttime;
@@ -114,7 +124,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFstarttime(String fstarttime) {
 		this.fstarttime = fstarttime;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@NotNull(message="结束日期不能为空")
 	public Date getFenddate() {
@@ -124,7 +134,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFenddate(Date fenddate) {
 		this.fenddate = fenddate;
 	}
-	
+
 	@Size(min=0, max=50, message="结束时间长度不能超过 50 个字符")
 	public String getFendtime() {
 		return fendtime;
@@ -133,7 +143,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFendtime(String fendtime) {
 		this.fendtime = fendtime;
 	}
-	
+
 	public Long getFearly() {
 		return fearly;
 	}
@@ -141,7 +151,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFearly(Long fearly) {
 		this.fearly = fearly;
 	}
-	
+
 	public Long getFismailalert() {
 		return fismailalert;
 	}
@@ -149,7 +159,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFismailalert(Long fismailalert) {
 		this.fismailalert = fismailalert;
 	}
-	
+
 	public Long getFismobilealert() {
 		return fismobilealert;
 	}
@@ -157,7 +167,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFismobilealert(Long fismobilealert) {
 		this.fismobilealert = fismobilealert;
 	}
-	
+
 	public Long getFiswechatalert() {
 		return fiswechatalert;
 	}
@@ -165,7 +175,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFiswechatalert(Long fiswechatalert) {
 		this.fiswechatalert = fiswechatalert;
 	}
-	
+
 	public Long getFschedulestate() {
 		return fschedulestate;
 	}
@@ -173,7 +183,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFschedulestate(Long fschedulestate) {
 		this.fschedulestate = fschedulestate;
 	}
-	
+
 	public Long getFsortcode() {
 		return fsortcode;
 	}
@@ -181,7 +191,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFsortcode(Long fsortcode) {
 		this.fsortcode = fsortcode;
 	}
-	
+
 	public Long getFdeletemark() {
 		return fdeletemark;
 	}
@@ -189,7 +199,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFdeletemark(Long fdeletemark) {
 		this.fdeletemark = fdeletemark;
 	}
-	
+
 	public Long getFenabledmark() {
 		return fenabledmark;
 	}
@@ -197,7 +207,7 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFenabledmark(Long fenabledmark) {
 		this.fenabledmark = fenabledmark;
 	}
-	
+
 	@Size(min=0, max=200, message="备注长度不能超过 200 个字符")
 	public String getFdescription() {
 		return fdescription;
@@ -206,5 +216,5 @@ public class Schedule extends DataEntity<Schedule> {
 	public void setFdescription(String fdescription) {
 		this.fdescription = fdescription;
 	}
-	
-}
+
+}

web/src/main/java/com/jeesite/modules/sys/web/schedule/ScheduleController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jeesite.modules.sys.entity.EmpUser;
+import com.jeesite.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -49,7 +50,8 @@ public class ScheduleController extends BaseController {
 	 */
 	@RequiresPermissions("sys:schedule:schedule:view")
 	@RequestMapping(value = {"schedule", ""})
-	public String schedule() {
+	public String schedule(Schedule schedule, Model model) {
+		model.addAttribute("schedule", schedule.getFlg());
 		return "modules/sys/schedule/schedule";
 	}
 
@@ -59,6 +61,7 @@ public class ScheduleController extends BaseController {
 	@RequiresPermissions("sys:schedule:schedule:view")
 	@RequestMapping(value = {"getlist", ""})
 	public List<Schedule> getxx(Schedule schedule) {
+		schedule.setCreateBy(UserUtils.getUser().getLoginCode());
 		List<Schedule> list=scheduleService.findList(schedule);
 		return list;
 	}
@@ -70,6 +73,7 @@ public class ScheduleController extends BaseController {
     @RequiresPermissions("sys:schedule:schedule:view")
     @RequestMapping(value = {"getweek", ""})
     public List<Schedule> weekgetxx(Schedule schedule) {
+        schedule.setCreateBy(UserUtils.getUser().getLoginCode());
         List<Schedule> list=scheduleService.informationweek();
         return list;
     }

web/src/main/resources/mappings/modules/sys/schedule/ScheduleDao.xml

@@ -2,17 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeesite.modules.sys.dao.schedule.ScheduleDao">
 
-	<!-- 查询数据
+	<!-- 查询数据  -->
 	<select id="findList" resultType="Schedule">
 		SELECT ${sqlMap.column.toSql()}
 		FROM ${sqlMap.table.toSql()}
 		<where>
-			${sqlMap.where.toSql()}
+			<if test="flg == 0"> flg=1 or create_by=#{createBy} and flg=0 </if>
+			<if test="flg == 1"> flg=1 </if>
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
+	</select>
 
 	<select id="informationweek" resultType="Schedule">
-		SELECT * FROM js_sys_schedule WHERE	YEARWEEK(date_format(F_StartDate,'%Y-%m-%d')) = YEARWEEK(now())
+		SELECT * FROM js_sys_schedule WHERE	YEARWEEK(date_format(F_StartDate,'%Y-%m-%d')) = YEARWEEK(now()) and (flg=1 or create_by=#{createBy} and flg=0)
 	</select>
 </mapper>

web/src/main/resources/static/schedule/fullcalendar/css/fullcalendar.css

@@ -67,12 +67,40 @@ a.fc-event,
 .fc-event-draggable{cursor: pointer;}
 a.fc-event{text-decoration: none;}
 .fc-rtl .fc-event{text-align: right;}
+
 .fc-event-skin {
-    border-color: #D06B64; /* default BORDER color*/
+    border-color: #bc3c3c; /* default BORDER color  D06B64*/
+    background-color: #bc3c3c; /* default BACKGROUND color*/
+    color: #fff;
+    /*border-radius:5px;*/
+}
+
+.fc-event-skin0 {
+    border-color: #3c8dbc; /* default BORDER color  D06B64*/
+    background-color: #3c8dbc; /* default BACKGROUND color*/
+    color: #fff;
+    /*border-radius:5px;*/
+}
+
+.fc-event-skin1 {
+    border-color: #D06B64; /* default BORDER color  D06B64*/
     background-color: #D06B64; /* default BACKGROUND color*/
     color: #fff;
     /*border-radius:5px;*/
 }
+.fc-event-skin2 {
+    border-color: #00a65a; /* default BORDER color  D06B64*/
+    background-color: #00a65a; /* default BACKGROUND color*/
+    color: #fff;
+    /*border-radius:5px;*/
+}
+.fc-event-skin3 {
+    border-color: #e4a74a; /* default BORDER color  D06B64*/
+    background-color: #e4a74a; /* default BACKGROUND color*/
+    color: #fff;
+    /*border-radius:5px;*/
+}
+
 .fc-event-inner{position: relative;width:auto;height: 100%;border-style: solid;border-width: 0;overflow: hidden;}
 .fc-event-time,
 .fc-event-title{padding: 0 1px;}

web/src/main/resources/views/modules/sys/schedule/schedule.html

@@ -11,7 +11,9 @@
 <script src="${ctxStatic}/schedule/fullcalendar/js/fullcalendar.min.js"></script>
 <link href="${ctxStatic}/schedule/fullcalendar/css/fullcalendar.css" rel="stylesheet" />
 <script type='text/javascript'>
+	var flg=0;
 	$(document).ready(function () {
+		flg=GetRequest("flg");
 		$('.calendar').fullCalendar({
 			header: {
 				left: 'prev,next',
@@ -51,15 +53,14 @@
 				var fend = $.fullCalendar.formatDate(event.end, "HH:mm");
 
 				if (view.name == "month") {//按月份
-					var evtcontent = '<div class="fc-event-inner fc-event-skin">';
+					var evtcontent = '<div class="fc-event-inner fc-event-skin'+event.fcategory+'">';
 					evtcontent += '<span class="fc-event-time">' + fstart + " - " + fend + '</span>';
 					evtcontent += '<span class="fc-event-title">: ' + event.title + '</span>&nbsp;&nbsp;&nbsp;&nbsp;<span onclick="btn_edit(\'' + event.id + '\')">修改</span>';
 					evtcontent += '&nbsp;&nbsp;&nbsp;&nbsp;<span onclick="btn_del(\'' + event.id + '\')">删除</span>';
 					evtcontent += '</div><div class="ui-resizable-handle ui-resizable-e">&nbsp;&nbsp;&nbsp;</div>';
-
 					element.html(evtcontent);
 				} else {
-					var evtcontent = '<div class="fc-event-inner fc-event-skin">';
+					var evtcontent = '<div class="fc-event-inner fc-event-skin'+event.fcategory+'">';
 					evtcontent += '<div class="fc-event-head fc-event-skin">';
 					evtcontent += '<div class="fc-event-time">' + fstart + " - " + fend + event.title + '</div>';
 					evtcontent += '</div>';
@@ -72,7 +73,7 @@
 			events: (function () {
 				var _data = [];
 				js.ajaxSubmit({
-					url: '${ctx}/sys/schedule/schedule/getlist',
+					url: '${ctx}/sys/schedule/schedule/getlist?flg='+flg,
 					data: {},
 					callback: function(data){
 						var date=data.scheduleList;
@@ -97,12 +98,12 @@
 
 	//添加日程
 	function btn_add() {
-		js.addTabPage(null, "新增日程", "${ctx}/sys/schedule/schedule/form")
+		js.addTabPage(null, "新增日程", "${ctx}/sys/schedule/schedule/form?flg="+flg)
 	};
 
 	//添加日程
 	function btn_edit(id) {
-		js.addTabPage(null, "修改日程", "${ctx}/sys/schedule/schedule/form?id="+id)
+		js.addTabPage(null, "修改日程", "${ctx}/sys/schedule/schedule/form?id="+id+"&flg="+flg)
 	};
 
 	function btn_del(id) {
@@ -122,5 +123,22 @@
 		});
 	}
 
+	function GetRequest(name)
+	{
+		var url = location.search;
+		var theRequest = new Object();
+		if (url.indexOf("?") != -1)
+		{
+			var str = url.substr(1);
+			strs = str.split("&");
+			for (var i = 0; i < strs.length; i++)
+			{
+				theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+			}
+		}
+		var value = theRequest[name];
+		return value;
+	}
+
 </script>
 

web/src/main/resources/views/modules/sys/schedule/scheduleForm.html

@@ -13,6 +13,7 @@
 			<div class="box-body">
 				<div class="form-unit">${text('基本信息')}</div>
 				<#form:hidden path="id"/>
+				<#form:hidden path="flg"/>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">