http

mybusiness/src/main/java/com/business/slfh/manager/dailymanager/domain/TBusDaily.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 【请填写功能名称】对象 t_bus_daily
- * 
+ *
  * @author lei
  * @date 2020-11-24
  */
@@ -76,129 +76,148 @@ public class TBusDaily extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date replyTime;
 
-    public void setId(String id) 
+    private Long deptId;
+    private String deptName;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(String id)
     {
         this.id = id;
     }
 
-    public String getId() 
+    public String getId()
     {
         return id;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
-    public void setDelFlag(String delFlag) 
+    public void setDelFlag(String delFlag)
     {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
+    public String getDelFlag()
     {
         return delFlag;
     }
-    public void setDailyType(String dailyType) 
+    public void setDailyType(String dailyType)
     {
         this.dailyType = dailyType;
     }
 
-    public String getDailyType() 
+    public String getDailyType()
     {
         return dailyType;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setUserName(String userName) 
+    public void setUserName(String userName)
     {
         this.userName = userName;
     }
 
-    public String getUserName() 
+    public String getUserName()
     {
         return userName;
     }
-    public void setDailyTime(Date dailyTime) 
+    public void setDailyTime(Date dailyTime)
     {
         this.dailyTime = dailyTime;
     }
 
-    public Date getDailyTime() 
+    public Date getDailyTime()
     {
         return dailyTime;
     }
-    public void setTitle(String title) 
+    public void setTitle(String title)
     {
         this.title = title;
     }
 
-    public String getTitle() 
+    public String getTitle()
     {
         return title;
     }
-    public void setContent(String content) 
+    public void setContent(String content)
     {
         this.content = content;
     }
 
-    public String getContent() 
+    public String getContent()
     {
         return content;
     }
-    public void setIshaveRes(Long ishaveRes) 
+    public void setIshaveRes(Long ishaveRes)
     {
         this.ishaveRes = ishaveRes;
     }
 
-    public Long getIshaveRes() 
+    public Long getIshaveRes()
     {
         return ishaveRes;
     }
-    public void setIshaveReply(Long ishaveReply) 
+    public void setIshaveReply(Long ishaveReply)
     {
         this.ishaveReply = ishaveReply;
     }
 
-    public Long getIshaveReply() 
+    public Long getIshaveReply()
     {
         return ishaveReply;
     }
-    public void setReplyContent(String replyContent) 
+    public void setReplyContent(String replyContent)
     {
         this.replyContent = replyContent;
     }
 
-    public String getReplyContent() 
+    public String getReplyContent()
     {
         return replyContent;
     }
-    public void setReplyUser(String replyUser) 
+    public void setReplyUser(String replyUser)
     {
         this.replyUser = replyUser;
     }
 
-    public String getReplyUser() 
+    public String getReplyUser()
     {
         return replyUser;
     }
-    public void setReplyTime(Date replyTime) 
+    public void setReplyTime(Date replyTime)
     {
         this.replyTime = replyTime;
     }
 
-    public Date getReplyTime() 
+    public Date getReplyTime()
     {
         return replyTime;
     }

mybusiness/src/main/java/com/business/slfh/manager/dailymanager/service/impl/TBusDailyServiceImpl.java

@@ -5,6 +5,7 @@ import com.business.slfh.manager.dailymanager.domain.TBusDaily;
 import com.business.slfh.manager.dailymanager.mapper.TBusDailyMapper;
 import com.business.slfh.manager.dailymanager.service.ITBusDailyService;
 import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
 import com.sooka.system.domain.SysUser;
@@ -15,7 +16,7 @@ import javax.annotation.Resource;
 
 /**
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author lei
  * @date 2020-11-24
  */
@@ -29,7 +30,7 @@ public class TBusDailyServiceImpl implements ITBusDailyService
 
     /**
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      */
@@ -43,11 +44,12 @@ public class TBusDailyServiceImpl implements ITBusDailyService
 
     /**
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tBusDaily 【请填写功能名称】
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<TBusDaily> selectTBusDailyList(TBusDaily tBusDaily)
     {
         List<TBusDaily> ls = tBusDailyMapper.selectTBusDailyList(tBusDaily);
@@ -59,7 +61,7 @@ public class TBusDailyServiceImpl implements ITBusDailyService
 
     /**
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tBusDaily 【请填写功能名称】
      * @return 结果
      */
@@ -71,12 +73,14 @@ public class TBusDailyServiceImpl implements ITBusDailyService
         tBusDaily.setUserId(sysUser.getUserId());
         tBusDaily.setUserName(sysUser.getUserName());
         tBusDaily.setDailyTime(DateUtils.getNowDate());
+        tBusDaily.setDeptId(sysUser.getDeptId());
+        tBusDaily.setDeptName(sysUser.getDept().getDeptName());
         return tBusDailyMapper.insertTBusDaily(tBusDaily);
     }
 
     /**
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tBusDaily 【请填写功能名称】
      * @return 结果
      */
@@ -89,7 +93,7 @@ public class TBusDailyServiceImpl implements ITBusDailyService
 
     /**
      * 删除【请填写功能名称】对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -101,7 +105,7 @@ public class TBusDailyServiceImpl implements ITBusDailyService
 
     /**
      * 删除【请填写功能名称】信息
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 结果
      */

mybusiness/src/main/java/com/business/slfh/manager/leaveinfomanager/service/impl/TBusLeaveinfoServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.business.slfh.manager.leaveinfomanager.domain.TBusLeaveinfo;
 import com.business.slfh.manager.leaveinfomanager.mapper.TBusLeaveinfoMapper;
 import com.business.slfh.manager.leaveinfomanager.service.ITBusLeaveinfoService;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
 import com.sooka.system.utils.DictUtils;
@@ -13,7 +14,7 @@ import javax.annotation.Resource;
 
 /**
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author lei
  * @date 2020-11-23
  */
@@ -25,7 +26,7 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      */
@@ -39,11 +40,12 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tBusLeaveinfo 【请填写功能名称】
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<TBusLeaveinfo> selectTBusLeaveinfoList(TBusLeaveinfo tBusLeaveinfo)
     {
         List<TBusLeaveinfo> ls = tBusLeaveinfoMapper.selectTBusLeaveinfoList(tBusLeaveinfo);
@@ -55,7 +57,7 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tBusLeaveinfo 【请填写功能名称】
      * @return 结果
      */
@@ -68,7 +70,7 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tBusLeaveinfo 【请填写功能名称】
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 删除【请填写功能名称】对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -93,7 +95,7 @@ public class TBusLeaveinfoServiceImpl implements ITBusLeaveinfoService
 
     /**
      * 删除【请填写功能名称】信息
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 结果
      */

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -125,9 +125,17 @@ public class Visualization_Event_Controller extends AppBaseController {
         String DEPTNAME = request.getParameter("DEPTNAME");
 
         //上报总数
-        int Visualization_Report_Event_Count = visualization_event_service.Visualization_Report_Event_Count();
+//        int Visualization_Report_Event_Count = visualization_event_service.Visualization_Report_Event_Count();
+        int Visualization_Report_Event_Count =0;
+
         //各类事件数量
         List <Visualization_Event_Count> Visualization_Event_Each_Count = visualization_event_service.Visualization_Event_Each_Count();
+
+        for(int i=0;i<Visualization_Event_Each_Count.size();i++){
+            Visualization_Event_Count c = Visualization_Event_Each_Count.get(i);
+            Visualization_Report_Event_Count+= Integer.parseInt(c.getCOUNT());
+        }
+
         //各类事件已确定数量
         List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count = visualization_event_service.Visualization_ALL_Event_Each_Count();
         //事件总数
@@ -366,7 +374,8 @@ public class Visualization_Event_Controller extends AppBaseController {
         Visualization_SYSQ_Count Visualization_SYSQ_Count = visualization_event_service.getSourceWaterCount();
         Visualization_SYSQ_Count.setSQZCD(String.valueOf(visualization_event_service.getCanalCount()));
         //水源list
-        List<Visualization_SourceWater> sourceWaterList = visualization_event_service.Visualization_SourceWater();
+        Visualization_SourceWater sourceWater = new Visualization_SourceWater();
+        List<Visualization_SourceWater> sourceWaterList = visualization_event_service.Visualization_SourceWater(sourceWater);
         //水渠list
         List<Visualization_Canal> canalList = visualization_event_service.Visualization_Canal();
         map.put("Visualization_SYSQ_Count", Visualization_SYSQ_Count);

mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -43,7 +43,7 @@ public interface Visualization_Event_Mapper {
 
     int getCanalCount();
 
-    List<Visualization_SourceWater> Visualization_SourceWater();
+    List<Visualization_SourceWater> Visualization_SourceWater( Visualization_SourceWater visualization_sourceWater);
 
     List<Visualization_Canal> Visualization_Canal();
 

mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java

@@ -24,7 +24,7 @@ public interface Visualization_Event_Service {
     Visualization_Camera_Count getVisualization_Camera_Count(Visualization_Camera camera);
     Visualization_SYSQ_Count getSourceWaterCount();
     int getCanalCount();
-    List<Visualization_SourceWater> Visualization_SourceWater();
+    List<Visualization_SourceWater> Visualization_SourceWater(Visualization_SourceWater visualization_sourceWater);
     List<Visualization_Canal> Visualization_Canal();
     Visualization_Forest_Count Visualization_Forest_Count();
     List<Visualization_Forest> Visualization_Forest();

mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -115,8 +115,9 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     }
 
     @Override
-    public List<Visualization_SourceWater> Visualization_SourceWater() {
-        return Visualization_Event_Mapper.Visualization_SourceWater();
+    @DataScope(deptAlias = "d")
+    public List<Visualization_SourceWater> Visualization_SourceWater(Visualization_SourceWater visualization_sourceWater) {
+        return Visualization_Event_Mapper.Visualization_SourceWater(visualization_sourceWater );
     }
 
     @Override

mybusiness/src/main/resources/mapper/grid/manager/TBusDailyMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.business.slfh.manager.dailymanager.mapper.TBusDailyMapper">
-    
+
     <resultMap type="TBusDaily" id="TBusDailyResult">
         <result property="id"    column="id"    />
         <result property="status"    column="status"    />
@@ -31,34 +31,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTBusDailyList" parameterType="TBusDaily" resultMap="TBusDailyResult">
-        <include refid="selectTBusDailyVo"/>
-        <where>  
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="dailyType != null  and dailyType != ''"> and daily_type = #{dailyType}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+        select
+        y.id as id,
+        y.status as status,
+        y.remark as remark,
+        y.del_flag as del_flag,
+        y.create_by as create_by,
+        y.create_time as create_time,
+        y.update_by as update_by,
+        y.update_time as update_time,
+        y.daily_type as daily_type ,
+        y.user_id as user_id,
+        y.user_name as user_name,
+        y.daily_time as daily_time,
+        y.title as title,
+        y.content as content,
+        y.ishave_res as ishave_res,
+        y.ishave_reply as ishave_reply,
+        y.reply_content as reply_content,
+        y.reply_user as reply_user,
+        y.reply_time as reply_time
+        from t_bus_daily y,sys_dept d
+
+        <where>
+            y.dept_id = d.dept_id
+            <if test="status != null  and status != ''"> and y.status = #{status}</if>
+            <if test="dailyType != null  and dailyType != ''"> and y.daily_type = #{dailyType}</if>
+            <if test="userId != null "> and y.user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and y.user_name like concat('%', #{userName}, '%')</if>
             <if test="params.beginDailyTime != null and params.beginDailyTime != ''"><!-- 开始时间检索 -->
-                AND date_format(daily_time,'%y%m%d') &gt;= date_format(#{params.beginDailyTime},'%y%m%d')
+                AND date_format(y.daily_time,'%y%m%d') &gt;= date_format(#{params.beginDailyTime},'%y%m%d')
             </if>
             <if test="params.endDailyTime != null and params.endDailyTime != ''"><!-- 结束时间检索 -->
-                AND date_format(daily_time,'%y%m%d') &lt;= date_format(#{params.endDailyTime},'%y%m%d')
+                AND date_format(y.daily_time,'%y%m%d') &lt;= date_format(#{params.endDailyTime},'%y%m%d')
             </if>
             <!--<if test="dailyTime != null "> and daily_time = #{dailyTime}</if>-->
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="ishaveRes != null "> and ishave_res = #{ishaveRes}</if>
-            <if test="ishaveReply != null "> and ishave_reply = #{ishaveReply}</if>
-            <if test="replyContent != null  and replyContent != ''"> and reply_content = #{replyContent}</if>
-            <if test="replyUser != null  and replyUser != ''"> and reply_user = #{replyUser}</if>
-            <if test="replyTime != null "> and reply_time = #{replyTime}</if>
+            <if test="title != null  and title != ''"> and y.title = #{title}</if>
+            <if test="content != null  and content != ''"> and y.content = #{content}</if>
+            <if test="ishaveRes != null "> and y.ishave_res = #{ishaveRes}</if>
+            <if test="ishaveReply != null "> and y.ishave_reply = #{ishaveReply}</if>
+            <if test="replyContent != null  and replyContent != ''"> and y.reply_content = #{replyContent}</if>
+            <if test="replyUser != null  and replyUser != ''"> and y.reply_user = #{replyUser}</if>
+            <if test="replyTime != null "> and y.reply_time = #{replyTime}</if>
         </where>
+        ${params.dataScope}
     </select>
-    
+
     <select id="selectTBusDailyById" parameterType="String" resultMap="TBusDailyResult">
         <include refid="selectTBusDailyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTBusDaily" parameterType="TBusDaily">
         insert into t_bus_daily
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -81,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null">reply_content,</if>
             <if test="replyUser != null">reply_user,</if>
             <if test="replyTime != null">reply_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -102,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null">#{replyContent},</if>
             <if test="replyUser != null">#{replyUser},</if>
             <if test="replyTime != null">#{replyTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
          </trim>
     </insert>
 
@@ -135,10 +162,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTBusDailyByIds" parameterType="String">
-        delete from t_bus_daily where id in 
+        delete from t_bus_daily where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
-</mapper>
+</mapper>

mybusiness/src/main/resources/mapper/grid/manager/TBusLeaveinfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.business.slfh.manager.leaveinfomanager.mapper.TBusLeaveinfoMapper">
-    
+
     <resultMap type="TBusLeaveinfo" id="TBusLeaveinfoResult">
         <result property="id"    column="id"    />
         <result property="status"    column="status"    />
@@ -26,12 +26,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBusLeaveinfoVo">
-        select id, status, remark, del_flag, create_by, create_time, update_by, update_time, user_id, user_name, begin_time, end_time, timelength, reason, dept_id, dept_name, leave_status, filltime from t_bus_leaveinfo
+        select id, status, remark, del_flag, create_by, create_time, update_by, update_time,
+         user_id, user_name, begin_time, end_time, timelength, reason, dept_id, dept_name, leave_status,
+          filltime from t_bus_leaveinfo
     </sql>
 
     <select id="selectTBusLeaveinfoList" parameterType="TBusLeaveinfo" resultMap="TBusLeaveinfoResult">
-        <include refid="selectTBusLeaveinfoVo"/>
-        <where>  
+        select
+        b.id as id,
+        b.status as status,
+        b.remark as remark,
+        b.del_flag as del_flag,
+        b.create_by as create_by,
+        b.create_time as create_time,
+        b.update_by as update_by,
+        b.update_time as update_time,
+        b.user_id as user_id,
+        b.user_name as user_name,
+        b.begin_time as begin_time,
+        b.end_time as end_time,
+        b.timelength as timelength,
+        b.reason as reason,
+        b.dept_id as dept_id,
+        b.dept_name as dept_name,
+        b.leave_status as leave_status,
+        b.filltime as filltime
+        from t_bus_leaveinfo b,sys_dept d
+        <where>
+            b.dept_id = d.dept_id
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
@@ -50,14 +72,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(filltime,'%y%m%d') &lt;= date_format(#{params.endFilltime},'%y%m%d')
             </if>
         </where>
+        ${params.dataScope}
         order by begin_time desc
     </select>
-    
+
     <select id="selectTBusLeaveinfoById" parameterType="String" resultMap="TBusLeaveinfoResult">
         <include refid="selectTBusLeaveinfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTBusLeaveinfo" parameterType="TBusLeaveinfo">
         insert into t_bus_leaveinfo
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -131,10 +154,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTBusLeaveinfoByIds" parameterType="String">
-        delete from t_bus_leaveinfo where id in 
+        delete from t_bus_leaveinfo where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
-</mapper>
+</mapper>

mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -759,8 +759,11 @@
         select if(isnull(sum(length)),0,sum(length)) SQZCD from t_res_canal;
     </select>
 
-    <select id="Visualization_SourceWater" resultMap="Visualization_SourceWater">
-        select * from t_res_sourcewater;
+    <select id="Visualization_SourceWater" resultMap="Visualization_SourceWater" parameterType="com.business.slfh.visualization.event.domain.Visualization_SourceWater">
+        select s.* from t_res_sourcewater s,sys_dept d
+        where s.dept_id=d.dept_id
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
     <select id="Visualization_Canal" resultMap="Visualization_Canal">

mybusiness/src/main/resources/templates/business/manager/dailymanager/detail.html

@@ -17,7 +17,7 @@
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>-->
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">日报类型：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{dailyTypeLabel}"></label>
@@ -30,14 +30,14 @@
                     <input name="userId" th:field="*{userId}" class="form-control" type="text">
                 </div>
             </div>-->
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">日报人姓名：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{userName}"></label>
                     <!--<input name="userName" th:field="*{userName}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">日报时间：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="${#dates.format(tBusDaily.dailyTime, 'yyyy-MM-dd')}"></label>
@@ -47,49 +47,49 @@
                     </div>-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">日报标题：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{title}"></label>
                     <!--<input name="title" th:field="*{title}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">日报内容：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{content}"></label>
                     <!--<input name="content" th:field="*{content}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">是否有辅助资源：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{ishaveRes}==1?'是':'否'"></label>
                     <!--<input name="ishaveRes" th:field="*{ishaveRes}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否有批复：</label>
-                <div class="col-sm-8">
-                    <label class="label_text_al" th:text="*{ishaveReply}==1?'是':'否'"></label>
-                    <!--<input name="ishaveReply" th:field="*{ishaveReply}" class="form-control" type="text">-->
-                </div>
-            </div>
-            <div class="form-group">    
+            <!--<div class="form-group">    -->
+                <!--<label class="col-sm-3 control-label">是否有批复：</label>-->
+                <!--<div class="col-sm-8">-->
+                    <!--<label class="label_text_al" th:text="*{ishaveReply}==1?'是':'否'"></label>-->
+                    <!--&lt;!&ndash;<input name="ishaveReply" th:field="*{ishaveReply}" class="form-control" type="text">&ndash;&gt;-->
+                <!--</div>-->
+            <!--</div>-->
+            <div class="form-group">
                 <label class="col-sm-3 control-label">批复内容：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{replyContent}"></label>
                     <!--<input name="replyContent" th:field="*{replyContent}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">批复人：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="*{replyUser}"></label>
                     <!--<input name="replyUser" th:field="*{replyUser}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">批复时间：</label>
                 <div class="col-sm-8">
                     <label class="label_text_al" th:text="${#dates.format(tBusDaily.replyTime, 'yyyy-MM-dd')}"></label>
@@ -128,4 +128,4 @@
         });
     </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/business/manager/dailymanager/index.html

@@ -157,12 +157,12 @@
                         return $.table.selectDictLabel(sys_is_notDict, value);
                     }
                 },
-                {
-                    field: 'ishaveReply',
-                    title: '是否有批复',formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(sys_is_notDict, value);
-                    }
-                },
+                // {
+                //     field: 'ishaveReply',
+                //     title: '是否有批复',formatter: function(value, row, index) {
+                //         return $.table.selectDictLabel(sys_is_notDict, value);
+                //     }
+                // },
                 /*{
                     field: 'replyContent',
                     title: '${comment}'
@@ -195,4 +195,4 @@
         }
     </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/business/visualization/details.html

@@ -291,7 +291,7 @@
     }
 
     function drivingEvents(id,type,action){
-
+        type = "reserveplan_type_1"
         confirmReport(id,type,action);
 
     }

mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -239,7 +239,7 @@
     <div class="nav syjqd">
         <div class="n_div" url="getVisualizationFrame_SYSQ">
             <a class="a_img"></a>
-            <a class="a_txt">水源水渠</a>
+            <a class="a_txt">水源资源</a>
         </div>
     </div>
     <!--<div class="nav sl">-->