Merge remote-tracking branch 'origin/master'

src/main/java/com/lightinit/hsdataplatform/controller/admin/ResourceCatelogMgrController.java

@@ -101,6 +101,13 @@ public class ResourceCatelogMgrController extends BaseController {
         LoginUser loginUser = (LoginUser) session.getAttribute(LoginUser.SESSION_KEY_LOGIN_USER);
         inputModel.setCreatedBy(loginUser.getId());
         ResultState<ResourceCatelog> resultStateRaw = resourceCatelogMgrService.addOrEdit(inputModel);
+        //如果为400，就代表目录创建失败，不必走下面创建结果对象的流程
+        if (ResultStateCode.INVALID_DATA == resultStateRaw.getStateCode()){
+            ResultState<ResourceCatelogEntityExtendModel> resultState = new ResultState<>();
+            resultState.setStateCode(resultStateRaw.getStateCode());
+            resultState.setMsg(resultStateRaw.getMsg());
+            return resultState;
+        }
         ResourceCatelog entity = resultStateRaw.getData();
         ResourceCatelogEntityExtendModel model = new ResourceCatelogEntityExtendModel();
         BeanUtils.copyProperties(entity, model);
@@ -109,7 +116,6 @@ public class ResourceCatelogMgrController extends BaseController {
         resultState.setStateCode(resultStateRaw.getStateCode());
         resultState.setMsg(resultStateRaw.getMsg());
         resultState.setData(model);
-
         return resultState;
     }
 

src/main/java/com/lightinit/hsdataplatform/controller/admin/RoadShowMgrController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 路演管理
@@ -29,8 +30,9 @@ public class RoadShowMgrController {
 
     @Autowired
     private IRoadShowMgrService roadShowMgrService;
+
     @RequestMapping(value = "index.htm")
-    public ModelAndView index(){
+    public ModelAndView index() {
         ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/index");
         modelAndView.addObject("dicRoadShowStage", DicRoadShowStage.getInstacne().getDicMap());
         modelAndView.addObject("dicRoadShowState", DicRoadShowState.getInstacne().getDicMap());
@@ -40,7 +42,7 @@ public class RoadShowMgrController {
 
 
     @RequestMapping(value = "list.action")
-    public ModelAndView list(RoadShowSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo){
+    public ModelAndView list(RoadShowSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo) {
         ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/list");
         BaseExample.Page pager = new BaseExample.Page();
         pager.setPageNo(pageNo);
@@ -53,15 +55,17 @@ public class RoadShowMgrController {
 
     @RequestMapping(value = "delete.action/{id}")
     @ResponseBody
-    public ResultState delete(@PathVariable long id){
+    public ResultState delete(@PathVariable long id) {
         ResultState<Long> resultState = roadShowMgrService.delete(id);
         return resultState;
     }
 
-    @RequestMapping(value = "detail.htm/{id}")
-    public ModelAndView detail(@PathVariable long id){
-            ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/detail");
-            modelAndView.addObject("busiModel", roadShowMgrService.queryOne(id));
-            return modelAndView;
+    @RequestMapping(value = "detail.htm")
+    public ModelAndView detail(@RequestParam("id") long id) {
+        ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/detail");
+        Map<String, Object> map = roadShowMgrService.queryOne(id);
+        modelAndView.addObject("busiModel", map.get("roadshowWithBLOBs"));
+        modelAndView.addObject("auditor", map.get("auditor"));
+        return modelAndView;
     }
 }

src/main/java/com/lightinit/hsdataplatform/impl/admin/LoggerMoniterServiceImpl.java

@@ -32,7 +32,11 @@ public class LoggerMoniterServiceImpl implements ILoggerMoniterService {
             criteria.andTitleLike("%"+inputModel.getTitle()+"%");
         }
         if(inputModel.getCreatedAtFrom()!=null && inputModel.getCreatedAtTo()!=null){
-            criteria.andLogTimeBetween(inputModel.getCreatedAtFrom(),inputModel.getCreatedAtTo());
+            if (inputModel.getCreatedAtFrom().compareTo(inputModel.getCreatedAtTo()) == 0){
+                criteria.andLogTimeGreaterThanOrEqualTo(inputModel.getCreatedAtFrom());
+            }else {
+                criteria.andLogTimeBetween(inputModel.getCreatedAtFrom(), inputModel.getCreatedAtTo());
+            }
         }else if(inputModel.getCreatedAtFrom()!=null){
             criteria.andLogTimeGreaterThanOrEqualTo(inputModel.getCreatedAtFrom());
         } else if(inputModel.getCreatedAtTo()!=null){

src/main/java/com/lightinit/hsdataplatform/impl/admin/RefundServiceImpl.java

@@ -105,6 +105,11 @@ public class RefundServiceImpl implements IRefundService {
     @Transactional
     public ResultState edit(Refund inputModel) {
         ResultState<Long> resultState = new ResultState<Long>();
+        if (inputModel.getRefundAmount() == null){
+            resultState.setStateCode(ResultStateCode.INVALID_DATA);
+            resultState.setMsg("输入金额不合法或者为空");
+            return resultState;
+        }
         DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
         inputModel.setCreatedAt(new Date());
         RefundExample example=new RefundExample();

src/main/java/com/lightinit/hsdataplatform/impl/admin/RelationshipManageServiceImpl.java

@@ -8,6 +8,7 @@ import com.lightinit.hsdataplatform.model.ResultStateCode;
 import com.lightinit.hsdataplatform.model.admin.*;
 import com.lightinit.hsdataplatform.service.admin.IRelationshipManageService;
 import com.lightinit.hsdataplatform.spring.DynamicDataContextHolder;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +70,8 @@ public class RelationshipManageServiceImpl implements IRelationshipManageService
        int sqlresult =0;
         String[] str =inputModel.getCalle().split(",");
         for (int i = 0; i < str.length; i++) {
-            inputModel.setCallee(Long.valueOf(str[i]));
+            String s = str[i];
+            inputModel.setCallee(StringUtils.isBlank(s)? 0 : Long.valueOf(s));
             AtlasRelationship model = new AtlasRelationship();
             BeanUtils.copyProperties(inputModel,model);
             sqlresult = atlasRelationshipMapper.insert(model);

src/main/java/com/lightinit/hsdataplatform/impl/admin/RoadShowMgrServiceImpl.java

@@ -117,12 +117,14 @@ public class RoadShowMgrServiceImpl implements IRoadShowMgrService {
     @Override
     public Map<String, Object> queryOne(long id) {
         RoadshowWithBLOBs roadshowWithBLOBs= roadshowMapper.selectByPrimaryKey(id);
-        AdminExample adminExample = new AdminExample();
-        adminExample.createCriteria().andIdEqualTo(roadshowWithBLOBs.getAuditedBy());
-        List<Admin> admins = adminMapper.selectByExample(adminExample);
         Map<String, Object> map = new HashMap<>();
         map.put("roadshowWithBLOBs",roadshowWithBLOBs);
-        map.put("auditor",admins.get(0).getUsername());
+        if (roadshowWithBLOBs.getAuditedBy() != null){
+            AdminExample adminExample = new AdminExample();
+            adminExample.createCriteria().andIdEqualTo(roadshowWithBLOBs.getAuditedBy());
+            List<Admin> admins = adminMapper.selectByExample(adminExample);
+            map.put("auditor",admins.get(0).getUsername());
+        }
         return map;
     }
 }

src/main/java/com/lightinit/hsdataplatform/tasks/logger/FluxTask.java

@@ -94,8 +94,10 @@ public class FluxTask implements ApplicationListener {
             return;
         }
         String[] timeStrFromStr = timeStrFrom.split(":");
+        String start = timeStrFromStr[0];
         String[] timeStrToStr = timeStrTo.split(":");
-        String cron="0 0/"+cycle+" "+timeStrFromStr[0]+"-"+timeStrToStr[0]+" * * ? *";
+        String end = timeStrToStr[0];
+        String cron="0 0/"+cycle+" "+(start.startsWith("0") ? start.charAt(1) : start)+"-"+(end.startsWith("0") ? end.charAt(1) : end) +" * * ? *";
         QuartzManager.modifyJobTime(JOB_NAME, JOB_GROUP_NAME, TRIGGER_NAME, TRIGGER_GROUP_NAME,cron);
     }
 }

src/main/java/com/lightinit/hsdataplatform/tasks/logger/LoggerJob.java

@@ -55,8 +55,9 @@ public class LoggerJob implements Job {
             if(StringUtils.isEmpty(path)){
                 return;
             }
-            File file = new File(path);
-            BufferedReader reader = new BufferedReader(new FileReader(file));
+            FileInputStream fis = new FileInputStream(path);
+            InputStreamReader inputStreamReader = new InputStreamReader(fis, "UTF-8");
+            BufferedReader reader = new BufferedReader(inputStreamReader);
             String line=null;
             StringBuilder builder = new StringBuilder();
             int count=0;//统计几处错误

src/main/java/com/lightinit/hsdataplatform/tasks/logger/LoggerTask.java

@@ -71,8 +71,10 @@ public class LoggerTask implements ApplicationListener {
                 return;
             }
             String[] timeStrFromStr = timeStrFrom.split(":");
+            String start = timeStrFromStr[0];
             String[] timeStrToStr = timeStrTo.split(":");
-            String cron="0 0/"+cycle+" "+timeStrFromStr[0]+"-"+timeStrToStr[0]+" * * ? *";
+            String end = timeStrToStr[0];
+            String cron="0 0/"+cycle+" "+(start.startsWith("0") ? start.charAt(1) : start)+"-"+(end.startsWith("0") ? end.charAt(1) : end) +" * * ? *";
             QuartzManager.addJob(JOB_NAME, JOB_GROUP_NAME, TRIGGER_NAME, TRIGGER_GROUP_NAME, LoggerJob.class, cron,map);
         }
     }

src/main/java/com/lightinit/hsdataplatform/tasks/logger/StateTask.java

@@ -70,8 +70,10 @@ public class StateTask implements ApplicationListener {
                 return;
             }
             String[] timeStrFromStr = timeStrFrom.split(":");
+            String start = timeStrFromStr[0];
             String[] timeStrToStr = timeStrTo.split(":");
-            String cron="0 0/"+cycle+" "+timeStrFromStr[0]+"-"+timeStrToStr[0]+" * * ? *";
+            String end = timeStrToStr[0];
+            String cron="0 0/"+cycle+" "+(start.startsWith("0") ? start.charAt(1) : start)+"-"+(end.startsWith("0") ? end.charAt(1) : end) +" * * ? *";
             QuartzManager.addJob(JOB_NAME, JOB_GROUP_NAME, TRIGGER_NAME, TRIGGER_GROUP_NAME, StateJob.class, cron,map);
         }
     }

src/main/resources/spring-task.xml

@@ -8,15 +8,15 @@
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
     <context:component-scan base-package="com.lightinit.hsdataplatform.tasks,com.lightinit.hsdataplatform.tasks.*" />
-    <task:scheduled-tasks>
-        <!--每天早7点50开始读取系统日志  0 40 15 * * ?-->
-        <task:scheduled ref="readLogsJobTask" method="run" cron="0 50 14 * * ?"/>
-    </task:scheduled-tasks>
+<!--    <task:scheduled-tasks>-->
+<!--        &lt;!&ndash;每天早7点50开始读取系统日志  0 40 15 * * ?&ndash;&gt;-->
+<!--        <task:scheduled ref="readLogsJobTask" method="run" cron="0 50 14 * * ?"/>-->
+<!--    </task:scheduled-tasks>-->
 
-    <task:scheduled-tasks>
-        <!--每天00：00：00开始对已付款的三天后到期的订单进行提醒  0 0 0 * * ? -->
-        <task:scheduled ref="ordersAndContractExpireTask" method="orderExpireWarningTask" cron="0 0 0 * * ?"/>
-    </task:scheduled-tasks>
+<!--    <task:scheduled-tasks>-->
+<!--        &lt;!&ndash;每天00：00：00开始对已付款的三天后到期的订单进行提醒  0 0 0 * * ? &ndash;&gt;-->
+<!--        <task:scheduled ref="ordersAndContractExpireTask" method="orderExpireWarningTask" cron="0 0 0 * * ?"/>-->
+<!--    </task:scheduled-tasks>-->
 
     <!--开启切面-->
     <aop:aspectj-autoproxy/>

src/main/resources/spring.xml

@@ -6,7 +6,6 @@
        http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context.xsd">
-
     <!-- 引入项目配置文件 -->
     <bean id="configProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
         <property name="locations">
@@ -24,7 +23,7 @@
     <context:annotation-config></context:annotation-config>
     <import resource="classpath:spring-shiro.xml"/>
     <!--<import resource="classpath:spring-mongodb.xml"/>-->
-    <!--<import resource="classpath:spring-task.xml"/>-->
+    <import resource="classpath:spring-task.xml"/>
     <!--<import resource="classpath:spring-solr.xml"/>-->
     <!--<import resource="spring-activemq.xml"/>-->
 

src/main/resources/sqlmaps/RequirementMapper.xml

@@ -417,7 +417,7 @@
     <if test="requirementName != null and requirementName.length() &gt; 0">
       <bind name="requirementName" value="'%' + _parameter.requirementName + '%'" />
     </if>
-      SELECT r.id AS rqrmnt_id,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.created_at,r.rqrmnt_state,r.platform_type
+      SELECT r.id AS rqrmnt_id,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.created_at,r.rqrmnt_state,r.platform_type,r.rqrmnt_type,r.rqrmnt_source
     FROM requirement r
       INNER JOIN requirement_microapp rm ON r.id=rm.id
     <where>

src/main/webapp/pages/admin/access_statistics/resourceCount.jsp

@@ -58,7 +58,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/activity_mgr/list.jsp

@@ -52,10 +52,10 @@
     $("#divGrid table tbody tr td:last-child")
         .on("click", "button[name='btnEdit']", function () {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.popBsPartial({ url: "<%=basePath%>/admin/activity_mgr/edit.htm/" + id });
+            $.popBsPartial({ url: "${pageContext.request.contextPath}/admin/activity_mgr/edit.htm/" + id });
         })
         .on("click", "button[name='btnDelete']", function() {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.delWithConfirm({ func: $.ajaxGetRefresh, funcArgs: { ajaxGetOptions: { url: "<%=basePath%>/admin/activity_mgr/delete.action/" + id } } });
+            $.delWithConfirm({ func: $.ajaxGetRefresh, funcArgs: { ajaxGetOptions: { url: "${pageContext.request.contextPath}/admin/activity_mgr/delete.action/" + id } } });
         });
 </script>

src/main/webapp/pages/admin/contract/add.jsp

@@ -83,7 +83,7 @@
             <div class="form-group">
                 <label for="contractAmount" class="col-sm-2 control-label">合同总金额</label>
                 <div class="col-sm-8">
-                    <input type="text" id="contractAmount" name="contractAmount" class="form-control" value=0 readonly/>
+                    <input type="text" id="contractAmount" name="contractAmount" class="form-control" value=0 />
                 </div>
             </div>
             <div class="form-group">

src/main/webapp/pages/admin/data_api/unshelve_result.jsp

@@ -19,5 +19,5 @@
     setTimeout(function () {
         window.parent.search();
         $(".close").click();
-    },5000)
+    },1000)
 </script>

src/main/webapp/pages/admin/datacatelog_mgr/index.jsp

@@ -37,10 +37,10 @@
     <input type="hidden" name="formSerialize" />
     <input type="hidden" name="pageNo" value="1" />
     <form id="formSearch" action="<%=basePath%>/admin/datacatelog_mgr/list.action" method="get" class="form-inline">
-        <div class="form-group">
-            <label for="catelogName">信息资源分类</label>
-            <input type="text" id="catelogName" name="catelogName" class="form-control" />
-        </div>
+<%--        <div class="form-group">--%>
+<%--            <label for="catelogName">信息资源分类</label>--%>
+<%--            <input type="text" id="catelogName" name="catelogName" class="form-control" />--%>
+<%--        </div>--%>
         <div class="form-group">
             <label for="sectorName">提供方</label>
             <input type="text" id="sectorName" name="sectorName" class="form-control" />

src/main/webapp/pages/admin/datacatelog_mgr/list.jsp

@@ -14,6 +14,7 @@
             <th>数据资源分类</th>
             <th>信息资源代码</th>--%>
             <th>信息资源名称</th>
+<%--            <th>信息资源分类</th>--%>
             <th>信息资源摘要</th>
             <%--<th>信息资源格式</th>--%>
             <th>信息资源提供方</th>
@@ -31,6 +32,7 @@
                 <td style="max-width:150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="${item.catelogName}">${item.catelogName}</td>
                 <td>${item.dataCode}</td>--%>
                 <td>${item.dataName}</td>
+<%--                <td>${item.catelogName}</td>--%>
                 <td>${item.dataSummary}</td>
                 <%--<td>${item.dataSourceTypeString}</td>--%>
                 <td>${item.sectorName}</td>

src/main/webapp/pages/admin/datacatelog_view/imageView.jsp

@@ -36,17 +36,23 @@
         </div>
     </div>
 </div>
-<jsp:include page="../../../common/admin/search_pre.jsp"></jsp:include>
+<div class="row hidden-print">
+    <div class="col-lg-12">
+        <div class="ibox">
+<%--            <div class="ibox-title">--%>
+<%--                <span>请输入或选择条件查询</span>--%>
+<%--            </div>--%>
+            <div class="ibox-content">
 <!-- 为ECharts准备一个具备大小（宽高）的Dom -->
-<form class="form-inline">
-    <div class="form-group">
-        <label for="resourceName">资源名称</label>
-        <input type="text" id="resourceName" name="resourceName" class="form-control" />
-    </div>
-    <div class="form-group">
-        <button id="btnSearch" type="button" onclick="searchImg()" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>
-    </div>
-</form>
+<%--<form class="form-inline">--%>
+<%--    <div class="form-group">--%>
+<%--        <label for="resourceName">资源名称</label>--%>
+<%--        <input type="text" id="resourceName" name="resourceName" class="form-control" />--%>
+<%--    </div>--%>
+<%--    <div class="form-group">--%>
+<%--        <button id="btnSearch" type="button" onclick="searchImg()" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>--%>
+<%--    </div>--%>
+<%--</form>--%>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
 <button id="btnAdd" onclick="javascript:window.location.href='<%=basePath%>/admin/datacatelog_mgr/index.htm'" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-bars" aria-hidden="true"></i></button>

src/main/webapp/pages/admin/microapp/list.jsp

@@ -10,6 +10,8 @@
         <thead>
         <tr>
             <th>需求名称</th>
+            <th>需求来源</th>
+            <th>需求类型</th>
             <th>需求摘要</th>
             <th>发布日期</th>
             <th>状态</th>
@@ -22,6 +24,8 @@
                 <c:forEach items="${list}" var="item" >
                     <tr>
                         <td><a href="javascript:void(0)" onclick="showItem(${item.rqrmntId})">${item.rqrmntName}</a> </td>
+                        <td>${item.rqrmntSource}</td>
+                        <td>${item.rqrmntType}</td>
                         <td>${item.rqrmntSummary}</td>
                         <td><fmt:formatDate value="${item.createdAt}" pattern="yyyy-MM-dd"/></td>
                         <td>${item.rqrmntState}</td>

src/main/webapp/pages/admin/refund/edit.jsp

@@ -22,7 +22,7 @@
 
     <div class="form-group">
         <label for="refundAmount">退款金额</label>
-        <input type="text" id="refundAmount" name="refundAmount" value="${busiModel.refundAmount}" class="form-control" />
+        <input type="number" id="refundAmount" name="refundAmount" value="${busiModel.refundAmount}" οninput="value=value.replace(/[^\d]/g,'')" class="form-control" />
         <span class="help-block"></span>
     </div>
     <div class="form-group">

src/main/webapp/pages/admin/relationshipManage/edit.jsp

@@ -8,8 +8,8 @@
 
     <div >
         <ul class="nav nav-tabs" role="tablist">
-            <li role="presentation" class="active"><a href="#caller" aria-controls="caller" role="tab" data-toggle="tab">已调用资源</a></li>
-            <li role="presentation"><a href="#callee" aria-controls="callee" role="tab" data-toggle="tab">添加调用资源</a></li>
+            <li role="presentation" class="active"><a href="#caller" aria-controls="caller" onclick="closeDiv()"   role="tab" data-toggle="tab">已调用资源</a></li>
+            <li role="presentation"><a href="#callee" aria-controls="callee" onclick="openDiv()" role="tab" data-toggle="tab">添加调用资源</a></li>
         </ul>
         <div class="tab-content">
             <div role="tabpanel" class="tab-pane active" id="caller" >
@@ -79,13 +79,21 @@
 <form id="callerForm" action="<%=basePath%>/admin/RelationshipManage/doEdit.action" method="post" class="form-inline">
     <input type="hidden" id="calle" name="calle" />
     <input type="hidden" id="callrr" name="caller" value="${resourceId}" />
-<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-close"></i>取消</button>
-<button type="button" id="btnSave" class="btn btn-primary"><i class="fa fa-check"></i>保存</button>
+<button type="button" style="display: none" id="btnCancel" class="btn btn-default" data-dismiss="modal"><i class="fa fa-close"></i>取消</button>
+<button type="button" style="display: none" id="btnSave" class="btn btn-primary"><i class="fa fa-check"></i>保存</button>
 </form>
 <jsp:include page="../../../common/admin/modal_content_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/modal_footer_pre.jsp"></jsp:include>
 
 <script type="text/javascript">
+    function openDiv() {
+        $("#btnCancel").show();
+        $("#btnSave").show();
+    }
+    function closeDiv() {
+        $("#btnCancel").hide();
+        $("#btnSave").hide();
+    }
     var checkedIds= [];//保存选中的id，亦适用于分页
     function searchResourceList() {
         var formSerialize = $("input[type='hidden'][name='formSerializeResourceList']").val();

src/main/webapp/pages/admin/roadshow_mgr/detail.jsp

@@ -60,7 +60,7 @@
     </div>
     <div class="form-group">
         <label for="auditedBy">审核人:</label>
-        <label id="auditedBy" name="auditedBy" >${busiModel.auditedBy !=null?busiModel.auditedBy:'无'}</label>
+        <label id="auditedBy" name="auditedBy" >${auditor !=null?auditor:'无'}</label>
         <span class="field-validation-valid help-block"></span>
     </div>
     <div class="form-group">

src/main/webapp/pages/admin/roadshow_mgr/list.jsp

@@ -63,7 +63,7 @@
 
         .on("click", "button[name='btnDetail']", function () {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.popBsPartial({ url: "<%=basePath%>/admin/roadshow_mgr/detail.htm/" + id });
+            $.popBsPartial({ url: "<%=basePath%>/admin/roadshow_mgr/detail.htm?id=" + id });
         })
         .on("click", "button[name='btnDelete']", function() {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();

src/main/webapp/pages/admin/runing_monitoring/runing_monitoring.jsp

@@ -55,7 +55,7 @@
 
 
         <div class="col-md-5 col-sm-5 form-group">
-            <label   >监控周期：</label>
+            <label   >监控周期(0-59)：</label>
             <input type="text"  class="form-control"  name="apiMonitoringCycle"value="${apiType.monitoringCycle}"  class="col-md-3 col-sm-3 control-label" />
             <span class="field-validation-valid help-block"></span>
         </div>
@@ -113,7 +113,7 @@
             <span class="field-validation-valid help-block"></span>
         </div>
         <div class="col-md-5 col-sm-5 form-group">
-            <label   >监控周期：</label>
+            <label   >监控周期(0-59)：</label>
             <input type="text"  class="form-control"  name="microappMonitoringCycle"value="${microappType.monitoringCycle}"  class="col-md-3 col-sm-3 control-label" />
             <span class="field-validation-valid help-block"></span>
         </div>
@@ -170,7 +170,7 @@
             <span class="field-validation-valid help-block"></span>
         </div>
         <div class="col-md-5 col-sm-5 form-group">
-            <label   >监控周期：</label>
+            <label   >监控周期(0-59)：</label>
             <input type="text"  class="form-control"  name="userLogMonitoringCycle"value="${userLogType.monitoringCycle}"  class="col-md-3 col-sm-3 control-label" />
             <span class="field-validation-valid help-block"></span>
         </div>

src/main/webapp/pages/admin/themeStatistics/deptCount.jsp

@@ -50,7 +50,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/themeStatistics/resourceCount.jsp

@@ -50,7 +50,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/themeStatistics/themeCount.jsp

@@ -51,7 +51,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/userpersonal_mgr/registerUserStatisticsIndex.jsp

@@ -30,21 +30,27 @@
             </div>
         </div>
     </div>
-    <jsp:include page="../../../common/admin/search_pre.jsp"></jsp:include>
+    <div class="row hidden-print">
+        <div class="col-lg-12">
+            <div class="ibox">
+<%--                <div class="ibox-title">--%>
+<%--                    <span></span>--%>
+<%--                </div>--%>
+                <div class="ibox-content">
     <input type="hidden" name="formSerialize" />
     <input type="hidden" name="pageNo" value="1" />
-   <%-- <form id="formSearch" action="<%=basePath%>/admin/userpersonal_mgr/list.action" method="get" class="form-inline">
-        <div class="form-group">
-            <label for="phone">手机号码</label>
-            <input type="text" id="phone" name="phone" class="form-control" />
-        </div>
-        <div class="form-group">
-            <button id="btnSearch" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>
-        </div>
-        <div class="form-group">
-        <button id="btnReset" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>重置</button>
-        </div>
-    </form>--%>
+<%--   <form id="formSearch" action="<%=basePath%>/admin/userpersonal_mgr/registerUserStatistics.action" method="get" class="form-inline">--%>
+<%--        <div class="form-group">--%>
+<%--            <label for="phone">年份</label>--%>
+<%--            <input type="text" id="year" name="year" class="form-control" />--%>
+<%--        </div>--%>
+<%--        <div class="form-group">--%>
+<%--            <button id="btnSearch" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>--%>
+<%--        </div>--%>
+<%--        <div class="form-group">--%>
+<%--        <button id="btnReset" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>重置</button>--%>
+<%--        </div>--%>
+<%--    </form>--%>
     <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
     <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
     <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>

src/main/webapp/pages/admin/userpersonal_mgr/registerUserStatisticsList.jsp

@@ -34,9 +34,9 @@
         </tbody>
     </table>
 </div>
-<jsp:include page="../../../common/admin/pager.jsp">
-    <jsp:param name="pageNo" value="${pager.pageNo}"/>
-    <jsp:param name="pageSize" value="${pager.pageSize}"/>
-    <jsp:param name="total" value="${pager.total}"/>
-</jsp:include>
+<%--<jsp:include page="../../../common/admin/pager.jsp">--%>
+<%--    <jsp:param name="pageNo" value="${pager.pageNo}"/>--%>
+<%--    <jsp:param name="pageSize" value="${pager.pageSize}"/>--%>
+<%--    <jsp:param name="total" value="${pager.total}"/>--%>
+<%--</jsp:include>--%>