更新文件夹名称小写

src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java

@@ -0,0 +1,144 @@
+package com.tenlion.twoduty.controller.api.indexauditlog;
+
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
+import ink.wgink.annotation.CheckRequestBodyAnnotation;
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.common.component.SecurityComponent;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResult;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO;
+import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
+import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IndexAuditLogController
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "指标审核日志表接口")
+@RestController
+@RequestMapping(ISystemConstant.API_PREFIX + "/indexauditlog")
+public class IndexAuditLogController extends DefaultBaseController {
+
+    @Autowired
+    private IIndexAuditLogService indexAuditLogService;
+    @Autowired
+    private SecurityComponent securityComponent;
+    @Autowired
+    private IIndexLibService iIndexLibService;
+
+
+    @ApiOperation(value = "指标审核分页列表", notes = "指标审核分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listauditpage/{indexLibId}")
+    public SuccessResultList<List<IndexAuditLogDTO>> listAuditPage(ListPage page,@PathVariable("indexLibId") String indexLibId) {
+        Map<String, Object> params = requestParams();
+        params.put("indexAuditUserId",securityComponent.getCurrentUser().getUserId());
+        List<String> list = new ArrayList<>();
+        for (IndexLibDTO indexLibDTO : iIndexLibService.getWebIndexLibId(indexLibId)) {
+            list.add(indexLibDTO.getIndexLibId());
+        }
+        params.put("indexLibIds",list);
+        page.setParams(params);
+        return indexAuditLogService.listPage(page);
+    }
+
+
+
+    @ApiOperation(value = "新增指标审核日志表", notes = "新增指标审核日志表接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PostMapping("save")
+    @CheckRequestBodyAnnotation
+    public SuccessResult save(@RequestBody IndexAuditLogVO indexAuditLogVO) {
+        indexAuditLogService.save(indexAuditLogVO);
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "删除指标审核日志表", notes = "删除指标审核日志表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @DeleteMapping("remove/{ids}")
+    public SuccessResult remove(@PathVariable("ids") String ids) {
+        indexAuditLogService.remove(Arrays.asList(ids.split("\\_")));
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "修改指标审核日志表", notes = "修改指标审核日志表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PutMapping("update/{indexAuditLogId}")
+    @CheckRequestBodyAnnotation
+    public SuccessResult update(@PathVariable("indexAuditLogId") String indexAuditLogId, @RequestBody IndexAuditLogVO indexAuditLogVO) {
+        indexAuditLogService.update(indexAuditLogId, indexAuditLogVO);
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "指标审核日志表详情", notes = "指标审核日志表详情接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get/{indexAuditLogId}")
+        public IndexAuditLogDTO get(@PathVariable("indexAuditLogId") String indexAuditLogId) {
+        return indexAuditLogService.get(indexAuditLogId);
+    }
+
+    @ApiOperation(value = "指标审核日志表列表", notes = "指标审核日志表列表接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("list")
+    public List<IndexAuditLogDTO> list() {
+        Map<String, Object> params = requestParams();
+        return indexAuditLogService.list(params);
+    }
+
+    @ApiOperation(value = "指标审核日志表分页列表", notes = "指标审核日志表分页列表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+        @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+        @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage")
+    public SuccessResultList<List<IndexAuditLogDTO>> listPage(ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return indexAuditLogService.listPage(page);
+    }
+
+    @ApiOperation(value = "指标审核日志表统计", notes = "指标审核日志表统计接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("count")
+    SuccessResultData<Integer> count() {
+        Map<String, Object> params = requestParams();
+        return new SuccessResultData<>(indexAuditLogService.count(params));
+    }
+
+}

src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java

@@ -41,6 +41,7 @@ public class IndexLibController extends DefaultBaseController {
     private IIndexLibService indexLibService;
 
 
+
     @ApiOperation(value = "指标统计", notes = "指标统计接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("countIndexLib/{indexLibParentId}")
@@ -49,9 +50,6 @@ public class IndexLibController extends DefaultBaseController {
     }
 
 
-
-
-
     @ApiOperation(value = "web页面导航列表", notes = "web页面导航列表接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("listwebtags")

src/main/java/com/tenlion/twoduty/controller/app/api/indexauditlog/IndexAuditLogAppController.java

@@ -0,0 +1,121 @@
+package com.tenlion.twoduty.controller.app.api.indexauditlog;
+
+import ink.wgink.annotation.CheckRequestBodyAnnotation;
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResult;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO;
+import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
+import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IndexAuditLogAppController
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "指标审核日志表接口")
+@RestController
+@RequestMapping(ISystemConstant.APP_PREFIX + "/indexauditlog")
+public class IndexAuditLogAppController extends DefaultBaseController {
+
+    @Autowired
+    private IIndexAuditLogService indexAuditLogService;
+
+    @ApiOperation(value = "新增指标审核日志表", notes = "新增指标审核日志表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PostMapping("save")
+    @CheckRequestBodyAnnotation
+    public SuccessResult save(@RequestHeader("token") String token, @RequestBody IndexAuditLogVO indexAuditLogVO) {
+        indexAuditLogService.save(token, indexAuditLogVO);
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "删除指标审核日志表(id列表)", notes = "删除指标审核日志表(id列表)接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @DeleteMapping("remove/{ids}")
+    public SuccessResult remove(@RequestHeader("token") String token, @PathVariable("ids") String ids) {
+        indexAuditLogService.remove(token, Arrays.asList(ids.split("\\_")));
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "修改指标审核日志表", notes = "修改指标审核日志表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PutMapping("updateindexauditlog/{indexAuditLogId}")
+    @CheckRequestBodyAnnotation
+    public SuccessResult updateIndexAuditLog(@RequestHeader("token") String token, @PathVariable("indexAuditLogId") String indexAuditLogId, @RequestBody IndexAuditLogVO indexAuditLogVO) {
+        indexAuditLogService.update(token, indexAuditLogId, indexAuditLogVO);
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "指标审核日志表详情(通过ID)", notes = "指标审核日志表详情(通过ID)接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get/{indexAuditLogId}")
+    public IndexAuditLogDTO get(@RequestHeader("token") String token, @PathVariable("indexAuditLogId") String indexAuditLogId) {
+        return indexAuditLogService.get(indexAuditLogId);
+    }
+
+    @ApiOperation(value = "指标审核日志表列表", notes = "指标审核日志表列表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("list")
+    public List<IndexAuditLogDTO> list(@RequestHeader("token") String token) {
+        Map<String, Object> params = requestParams();
+        return indexAuditLogService.list(params);
+    }
+
+    @ApiOperation(value = "指标审核日志表分页列表", notes = "指标审核日志表分页列表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+        @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+        @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpageindexauditlog")
+    public SuccessResultList<List<IndexAuditLogDTO>> listPage(@RequestHeader("token") String token, ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return indexAuditLogService.listPage(page);
+    }
+
+    @ApiOperation(value = "指标审核日志表统计", notes = "指标审核日志表统计接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("count")
+    SuccessResultData<Integer> count() {
+        Map<String, Object> params = requestParams();
+        return new SuccessResultData<>(indexAuditLogService.count(params));
+    }
+
+}

src/main/java/com/tenlion/twoduty/controller/app/api/indexlib/IndexLibAppController.java

@@ -1,5 +1,8 @@
 package com.tenlion.twoduty.controller.app.api.indexlib;
 
+
+import com.alibaba.fastjson.JSONObject;
+
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
@@ -14,8 +17,12 @@ import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +41,168 @@ public class IndexLibAppController extends DefaultBaseController {
     @Autowired
     private IIndexLibService indexLibService;
 
+    @GetMapping("test"+ISystemConstant.APP_RELEASE_SUFFIX)
+    public JSONObject test(){
+        JSONObject json = new JSONObject();
+        HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()){
+            String headerName = (String) headerNames.nextElement();
+            json.put(headerName,request.getHeader(headerName));
+        }
+        json.put("getMethod:" ,request.getMethod());
+        json.put("getQueryString:" ,request.getQueryString() );
+        json.put("getProtocol:" , request.getProtocol() );
+        json.put("getContextPath" ,request.getContextPath() );
+        json.put("getPathInfo:" ,request.getPathInfo() );
+        json.put("getPathTranslated:" ,request.getPathTranslated());
+        json.put("getServletPath:" ,request.getServletPath());
+        json.put("getRemoteAddr:" , request.getRemoteAddr());
+        json.put("getRemoteHost:" , request.getRemoteHost());
+        json.put("getRemotePort:" , request.getRemotePort());
+        json.put("getLocalAddr:" , request.getLocalAddr());
+        json.put("getLocalName:" , request.getLocalName() );
+        json.put("getLocalPort:" ,request.getLocalPort());
+        json.put("getServerName:" , request.getServerName());
+        json.put("getServerPort:" , request.getServerPort());
+        json.put("getScheme:" ,request.getScheme());
+        json.put("getRequestURL:" , request.getRequestURL() );
+        Enumeration parameterNames = request.getParameterNames();
+        while (parameterNames.hasMoreElements()){
+            String parasm = (String) parameterNames.nextElement();
+            json.put(parasm,request.getParameter(parasm));
+        }
+
+        return json;
+    }
+
+    @GetMapping("test2"+ISystemConstant.APP_RELEASE_SUFFIX+"/{aa}")
+    public JSONObject test2( @PathVariable("aa") String aa){
+        JSONObject json = new JSONObject();
+        JSONObject header = new JSONObject();
+        JSONObject requset = new JSONObject();
+        JSONObject path = new JSONObject();
+        path.put("aa",aa);
+        HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()){
+            String headerName = (String) headerNames.nextElement();
+            header.put(headerName,request.getHeader(headerName));
+        }
+        requset.put("getMethod:" ,request.getMethod());
+        requset.put("getQueryString:" ,request.getQueryString() );
+        requset.put("getProtocol:" , request.getProtocol() );
+        requset.put("getContextPath" ,request.getContextPath() );
+        requset.put("getPathInfo:" ,request.getPathInfo() );
+        requset.put("getPathTranslated:" ,request.getPathTranslated());
+        requset.put("getServletPath:" ,request.getServletPath());
+        requset.put("getRemoteAddr:" , request.getRemoteAddr());
+        requset.put("getRemoteHost:" , request.getRemoteHost());
+        requset.put("getRemotePort:" , request.getRemotePort());
+        requset.put("getLocalAddr:" , request.getLocalAddr());
+        requset.put("getLocalName:" , request.getLocalName() );
+        requset.put("getLocalPort:" ,request.getLocalPort());
+        requset.put("getServerName:" , request.getServerName());
+        requset.put("getServerPort:" , request.getServerPort());
+        requset.put("getScheme:" ,request.getScheme());
+        requset.put("getRequestURL:" , request.getRequestURL() );
+        Enumeration parameterNames = request.getParameterNames();
+        while (parameterNames.hasMoreElements()){
+            String parasm = (String) parameterNames.nextElement();
+            json.put(parasm,request.getParameter(parasm));
+        }
+        json.put("header",header);
+        json.put("requset",requset);
+        json.put("path",path);
+        return json;
+    }
+
+    @PostMapping("testpost1"+ISystemConstant.APP_RELEASE_SUFFIX)
+    public JSONObject testPOST1(@RequestBody JSONObject form){
+        JSONObject json = new JSONObject();
+        JSONObject header = new JSONObject();
+        JSONObject requset = new JSONObject();
+        HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()){
+            String headerName = (String) headerNames.nextElement();
+            header.put(headerName,request.getHeader(headerName));
+        }
+
+        requset.put("getMethod:" ,request.getMethod());
+        requset.put("getQueryString:" ,request.getQueryString() );
+        requset.put("getProtocol:" , request.getProtocol() );
+        requset.put("getContextPath" ,request.getContextPath() );
+        requset.put("getPathInfo:" ,request.getPathInfo() );
+        requset.put("getPathTranslated:" ,request.getPathTranslated());
+        requset.put("getServletPath:" ,request.getServletPath());
+        requset.put("getRemoteAddr:" , request.getRemoteAddr());
+        requset.put("getRemoteHost:" , request.getRemoteHost());
+        requset.put("getRemotePort:" , request.getRemotePort());
+        requset.put("getLocalAddr:" , request.getLocalAddr());
+        requset.put("getLocalName:" , request.getLocalName() );
+        requset.put("getLocalPort:" ,request.getLocalPort());
+        requset.put("getServerName:" , request.getServerName());
+        requset.put("getServerPort:" , request.getServerPort());
+        requset.put("getScheme:" ,request.getScheme());
+        requset.put("getRequestURL:" , request.getRequestURL() );
+        Enumeration parameterNames = request.getParameterNames();
+        while (parameterNames.hasMoreElements()){
+            String parasm = (String) parameterNames.nextElement();
+            requset.put(parasm,request.getParameter(parasm));
+        }
+
+        json.put("header",header);
+        json.put("requset",requset);
+        json.put("from",form);
+        return json;
+    }
+
+    @PostMapping("testpost2"+ISystemConstant.APP_RELEASE_SUFFIX)
+    public JSONObject testPOST2(Map<String, Object> map){
+
+        JSONObject json = new JSONObject();
+        JSONObject header = new JSONObject();
+        JSONObject requset = new JSONObject();
+        HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()){
+            String headerName = (String) headerNames.nextElement();
+            header.put(headerName,request.getHeader(headerName));
+        }
+
+        requset.put("getMethod:" ,request.getMethod());
+        requset.put("getQueryString:" ,request.getQueryString() );
+        requset.put("getProtocol:" , request.getProtocol() );
+        requset.put("getContextPath" ,request.getContextPath() );
+        requset.put("getPathInfo:" ,request.getPathInfo() );
+        requset.put("getPathTranslated:" ,request.getPathTranslated());
+        requset.put("getServletPath:" ,request.getServletPath());
+        requset.put("getRemoteAddr:" , request.getRemoteAddr());
+        requset.put("getRemoteHost:" , request.getRemoteHost());
+        requset.put("getRemotePort:" , request.getRemotePort());
+        requset.put("getLocalAddr:" , request.getLocalAddr());
+        requset.put("getLocalName:" , request.getLocalName() );
+        requset.put("getLocalPort:" ,request.getLocalPort());
+        requset.put("getServerName:" , request.getServerName());
+        requset.put("getServerPort:" , request.getServerPort());
+        requset.put("getScheme:" ,request.getScheme());
+        requset.put("getRequestURL:" , request.getRequestURL() );
+        Enumeration parameterNames = request.getParameterNames();
+        while (parameterNames.hasMoreElements()){
+            String parasm = (String) parameterNames.nextElement();
+            requset.put(parasm,request.getParameter(parasm));
+        }
+
+        json.put("header",header);
+        json.put("requset",requset);
+        json.put("map",map);
+        return json;
+    }
+
+
+
+
     @ApiOperation(value = "新增", notes = "新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", paramType = "header")

src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java

@@ -4,6 +4,7 @@ package com.tenlion.twoduty.controller.route;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.common.component.SecurityComponent;
 import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.properties.ServerProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,8 @@ import org.springframework.web.servlet.ModelAndView;
 public class indexWebController extends DefaultBaseController {
     @Autowired
     private SecurityComponent securityComponent;
-
+    @Autowired
+    private ServerProperties serverProperties;
 
     @ApiOperation(value = "后台页面首页", notes = "后台页面首页接口")
     @GetMapping("indexweb")
@@ -32,6 +34,7 @@ public class indexWebController extends DefaultBaseController {
         ModelAndView mv = new ModelAndView("index");
         mv.addObject("userName",securityComponent.getCurrentUser().getUserName());
         mv.addObject("userUserName",securityComponent.getCurrentUser().getUserUsername());
+        mv.addObject("systemTitle",serverProperties.getSystemTitle());
         return mv;
     }
 

src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java

@@ -0,0 +1,127 @@
+package com.tenlion.twoduty.dao.indexauditlog;
+
+import ink.wgink.exceptions.RemoveException;
+import ink.wgink.exceptions.SaveException;
+import ink.wgink.exceptions.SearchException;
+import ink.wgink.exceptions.UpdateException;
+import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO;
+import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO;
+import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IIndexAuditLogDao
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@Repository
+public interface IIndexAuditLogDao {
+
+
+    /**
+     * 修改业务表审核状态
+     * @param params
+     * @throws UpdateException
+     */
+    void updateBAuditStatus(Map<String, Object> params) throws UpdateException;
+    /**
+     * 新增指标审核日志表
+     *
+     * @param params
+     * @throws SaveException
+     */
+    void save(Map<String, Object> params) throws SaveException;
+
+    /**
+     * 删除指标审核日志表
+     *
+     * @param params
+     * @throws RemoveException
+     */
+    void remove(Map<String, Object> params) throws RemoveException;
+
+    /**
+     * 删除指标审核日志表（物理）
+     *
+     * @param params
+     * @throws RemoveException
+     */
+    void delete(Map<String, Object> params) throws RemoveException;
+
+    /**
+     * 修改指标审核日志表
+     *
+     * @param params
+     * @throws UpdateException
+     */
+    void update(Map<String, Object> params) throws UpdateException;
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    IndexAuditLogDTO get(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    IndexAuditLogBO getBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    IndexAuditLogPO getPO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<IndexAuditLogDTO> list(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<IndexAuditLogBO> listBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<IndexAuditLogPO> listPO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 指标审核日志表统计
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    Integer count(Map<String, Object> params) throws SearchException;
+
+}

src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java

@@ -0,0 +1,113 @@
+package com.tenlion.twoduty.pojo.bos.indexauditlog;
+
+/**
+ *
+ * @ClassName: IndexAuditLogBO
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+public class IndexAuditLogBO {
+
+    private String indexAuditLogId;
+    private String indexBId;
+    private String indexLibId;
+
+    private String indexAuditStatus;
+    private String indexAuditResult;
+    private String indexAuditUserId;
+    private String gmtCreate;
+    private String creator;
+    private String gmtModified;
+    private String modifier;
+    private Integer isDelete;
+
+    public String getIndexAuditLogId() {
+        return indexAuditLogId == null ? "" : indexAuditLogId.trim();
+    }
+
+    public void setIndexAuditLogId(String indexAuditLogId) {
+        this.indexAuditLogId = indexAuditLogId;
+    }
+
+    public String getIndexBId() {
+        return indexBId == null ? "" : indexBId.trim();
+    }
+
+    public void setIndexBId(String indexBId) {
+        this.indexBId = indexBId;
+    }
+
+    public String getIndexAuditStatus() {
+        return indexAuditStatus == null ? "" : indexAuditStatus.trim();
+    }
+
+    public void setIndexAuditStatus(String indexAuditStatus) {
+        this.indexAuditStatus = indexAuditStatus;
+    }
+
+    public String getIndexAuditResult() {
+        return indexAuditResult == null ? "" : indexAuditResult.trim();
+    }
+
+    public void setIndexAuditResult(String indexAuditResult) {
+        this.indexAuditResult = indexAuditResult;
+    }
+
+    public String getIndexAuditUserId() {
+        return indexAuditUserId == null ? "" : indexAuditUserId.trim();
+    }
+
+    public void setIndexAuditUserId(String indexAuditUserId) {
+        this.indexAuditUserId = indexAuditUserId;
+    }
+
+    public String getGmtCreate() {
+        return gmtCreate == null ? "" : gmtCreate.trim();
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public String getCreator() {
+        return creator == null ? "" : creator.trim();
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getGmtModified() {
+        return gmtModified == null ? "" : gmtModified.trim();
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getModifier() {
+        return modifier == null ? "" : modifier.trim();
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete == null ? 0 : isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getIndexLibId() {
+        return indexLibId;
+    }
+
+    public void setIndexLibId(String indexLibId) {
+        this.indexLibId = indexLibId;
+    }
+}

src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java

@@ -16,6 +16,7 @@ public class IndexTemplateBO {
     private String indexTemplateName;
     private String indexTemplateSavePath;
     private String indexTemplateUploadPath;
+    private String indexTemplateShowPath;
     private String indexTemplateListPath;
     private String indexTemplateTableName;
     private String indexTemplateRemark;
@@ -129,4 +130,12 @@ public class IndexTemplateBO {
     public void setIndexTemplateTableName(String indexTemplateTableName) {
         this.indexTemplateTableName = indexTemplateTableName;
     }
+
+    public String getIndexTemplateShowPath() {
+        return indexTemplateShowPath;
+    }
+
+    public void setIndexTemplateShowPath(String indexTemplateShowPath) {
+        this.indexTemplateShowPath = indexTemplateShowPath;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java

@@ -0,0 +1,77 @@
+package com.tenlion.twoduty.pojo.dtos.indexauditlog;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ *
+ * @ClassName: IndexAuditLogDTO
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@ApiModel
+public class IndexAuditLogDTO {
+
+    @ApiModelProperty(name = "indexAuditLogId", value = "主键")
+    private String indexAuditLogId;
+    @ApiModelProperty(name = "indexBId", value = "指标业务ID")
+    private String indexBId;
+    @ApiModelProperty(name = "indexLibId", value = "指标ID")
+    private String indexLibId;
+    @ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过")
+    private String indexAuditStatus;
+    @ApiModelProperty(name = "indexAuditResult", value = "审核内容")
+    private String indexAuditResult;
+    @ApiModelProperty(name = "indexAuditUserId", value = "审核人ID")
+    private String indexAuditUserId;
+
+    public String getIndexAuditLogId() {
+        return indexAuditLogId == null ? "" : indexAuditLogId.trim();
+    }
+
+    public void setIndexAuditLogId(String indexAuditLogId) {
+        this.indexAuditLogId = indexAuditLogId;
+    }
+
+    public String getIndexBId() {
+        return indexBId == null ? "" : indexBId.trim();
+    }
+
+    public void setIndexBId(String indexBId) {
+        this.indexBId = indexBId;
+    }
+
+    public String getIndexAuditStatus() {
+        return indexAuditStatus == null ? "" : indexAuditStatus.trim();
+    }
+
+    public void setIndexAuditStatus(String indexAuditStatus) {
+        this.indexAuditStatus = indexAuditStatus;
+    }
+
+    public String getIndexAuditResult() {
+        return indexAuditResult == null ? "" : indexAuditResult.trim();
+    }
+
+    public void setIndexAuditResult(String indexAuditResult) {
+        this.indexAuditResult = indexAuditResult;
+    }
+
+    public String getIndexAuditUserId() {
+        return indexAuditUserId == null ? "" : indexAuditUserId.trim();
+    }
+
+    public void setIndexAuditUserId(String indexAuditUserId) {
+        this.indexAuditUserId = indexAuditUserId;
+    }
+
+    public String getIndexLibId() {
+        return indexLibId;
+    }
+
+    public void setIndexLibId(String indexLibId) {
+        this.indexLibId = indexLibId;
+    }
+}

src/main/java/com/tenlion/twoduty/pojo/dtos/indexlib/IndexLibDTO.java

@@ -39,7 +39,8 @@ public class IndexLibDTO {
     private String indexTemplateUploadPath;
     @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径")
     private String indexTemplateListPath;
-
+    @ApiModelProperty(name = "indexTemplateShowPath", value = "查看路径")
+    private String indexTemplateShowPath;
 
 
 
@@ -138,4 +139,12 @@ public class IndexLibDTO {
     public void setIndexTemplateListPath(String indexTemplateListPath) {
         this.indexTemplateListPath = indexTemplateListPath;
     }
+
+    public String getIndexTemplateShowPath() {
+        return indexTemplateShowPath;
+    }
+
+    public void setIndexTemplateShowPath(String indexTemplateShowPath) {
+        this.indexTemplateShowPath = indexTemplateShowPath;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java

@@ -25,6 +25,8 @@ public class IndexTemplateDTO {
     private String indexTemplateSavePath;
     @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径")
     private String indexTemplateUploadPath;
+    @ApiModelProperty(name = "indexTemplateShowPath", value = "显示路径")
+    private String indexTemplateShowPath;
     @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径")
     private String indexTemplateListPath;
     @ApiModelProperty(name = "indexTemplateTableName", value = "业务表名")
@@ -97,4 +99,12 @@ public class IndexTemplateDTO {
     public void setIndexTemplateTableName(String indexTemplateTableName) {
         this.indexTemplateTableName = indexTemplateTableName;
     }
+
+    public String getIndexTemplateShowPath() {
+        return indexTemplateShowPath;
+    }
+
+    public void setIndexTemplateShowPath(String indexTemplateShowPath) {
+        this.indexTemplateShowPath = indexTemplateShowPath;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java

@@ -0,0 +1,113 @@
+package com.tenlion.twoduty.pojo.pos.indexauditlog;
+
+/**
+ *
+ * @ClassName: IndexAuditLogPO
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+public class IndexAuditLogPO {
+
+    private String indexAuditLogId;
+    private String indexBId;
+    private String indexLibId;
+    private String indexAuditStatus;
+    private String indexAuditResult;
+    private String indexAuditUserId;
+    private String gmtCreate;
+    private String creator;
+    private String gmtModified;
+    private String modifier;
+    private Integer isDelete;
+
+    public String getIndexAuditLogId() {
+        return indexAuditLogId == null ? "" : indexAuditLogId.trim();
+    }
+
+    public void setIndexAuditLogId(String indexAuditLogId) {
+        this.indexAuditLogId = indexAuditLogId;
+    }
+
+    public String getIndexBId() {
+        return indexBId == null ? "" : indexBId.trim();
+    }
+
+    public void setIndexBId(String indexBId) {
+        this.indexBId = indexBId;
+    }
+
+    public String getIndexAuditStatus() {
+        return indexAuditStatus == null ? "" : indexAuditStatus.trim();
+    }
+
+    public void setIndexAuditStatus(String indexAuditStatus) {
+        this.indexAuditStatus = indexAuditStatus;
+    }
+
+    public String getIndexAuditResult() {
+        return indexAuditResult == null ? "" : indexAuditResult.trim();
+    }
+
+    public void setIndexAuditResult(String indexAuditResult) {
+        this.indexAuditResult = indexAuditResult;
+    }
+
+    public String getIndexAuditUserId() {
+        return indexAuditUserId == null ? "" : indexAuditUserId.trim();
+    }
+
+    public void setIndexAuditUserId(String indexAuditUserId) {
+        this.indexAuditUserId = indexAuditUserId;
+    }
+
+    public String getGmtCreate() {
+        return gmtCreate == null ? "" : gmtCreate.trim();
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public String getCreator() {
+        return creator == null ? "" : creator.trim();
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getGmtModified() {
+        return gmtModified == null ? "" : gmtModified.trim();
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getModifier() {
+        return modifier == null ? "" : modifier.trim();
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete == null ? 0 : isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+
+    public String getIndexLibId() {
+        return indexLibId;
+    }
+
+    public void setIndexLibId(String indexLibId) {
+        this.indexLibId = indexLibId;
+    }
+}

src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java

@@ -16,6 +16,7 @@ public class IndexTemplatePO {
     private String indexTemplateName;
     private String indexTemplateSavePath;
     private String indexTemplateUploadPath;
+    private String indexTemplateShowPath;
     private String indexTemplateListPath;
     private String indexTemplateTableName;
     private String indexTemplateRemark;
@@ -129,4 +130,12 @@ public class IndexTemplatePO {
     public void setIndexTemplateTableName(String indexTemplateTableName) {
         this.indexTemplateTableName = indexTemplateTableName;
     }
+
+    public String getIndexTemplateShowPath() {
+        return indexTemplateShowPath;
+    }
+
+    public void setIndexTemplateShowPath(String indexTemplateShowPath) {
+        this.indexTemplateShowPath = indexTemplateShowPath;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java

@@ -0,0 +1,69 @@
+package com.tenlion.twoduty.pojo.vos.indexauditlog;
+
+import ink.wgink.annotation.CheckEmptyAnnotation;
+import ink.wgink.annotation.CheckNumberAnnotation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ *
+ * @ClassName: IndexAuditLogVO
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@ApiModel
+public class IndexAuditLogVO {
+
+    @ApiModelProperty(name = "indexBId", value = "指标业务ID")
+    private String indexBId;
+    @ApiModelProperty(name = "indexLibId", value = "指标ID")
+    private String indexLibId;
+    @ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过")
+    private String indexAuditStatus;
+    @ApiModelProperty(name = "indexAuditResult", value = "审核内容")
+    private String indexAuditResult;
+    @ApiModelProperty(name = "indexAuditUserId", value = "审核人ID")
+    private String indexAuditUserId;
+
+    public String getIndexBId() {
+        return indexBId == null ? "" : indexBId.trim();
+    }
+
+    public void setIndexBId(String indexBId) {
+        this.indexBId = indexBId;
+    }
+
+    public String getIndexAuditStatus() {
+        return indexAuditStatus == null ? "" : indexAuditStatus.trim();
+    }
+
+    public void setIndexAuditStatus(String indexAuditStatus) {
+        this.indexAuditStatus = indexAuditStatus;
+    }
+
+    public String getIndexAuditResult() {
+        return indexAuditResult == null ? "" : indexAuditResult.trim();
+    }
+
+    public void setIndexAuditResult(String indexAuditResult) {
+        this.indexAuditResult = indexAuditResult;
+    }
+
+    public String getIndexAuditUserId() {
+        return indexAuditUserId == null ? "" : indexAuditUserId.trim();
+    }
+
+    public void setIndexAuditUserId(String indexAuditUserId) {
+        this.indexAuditUserId = indexAuditUserId;
+    }
+
+    public String getIndexLibId() {
+        return indexLibId;
+    }
+
+    public void setIndexLibId(String indexLibId) {
+        this.indexLibId = indexLibId;
+    }
+}

src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java

@@ -23,6 +23,9 @@ public class IndexTemplateVO {
     private String indexTemplateSavePath;
     @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径")
     private String indexTemplateUploadPath;
+    @ApiModelProperty(name = "indexTemplateShowPath", value = "显示路径")
+    private String indexTemplateShowPath;
+
     @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径")
     private String indexTemplateListPath;
     @ApiModelProperty(name = "indexTemplateTableName", value = "业务表名")
@@ -88,4 +91,13 @@ public class IndexTemplateVO {
     public void setIndexTemplateTableName(String indexTemplateTableName) {
         this.indexTemplateTableName = indexTemplateTableName;
     }
+
+
+    public String getIndexTemplateShowPath() {
+        return indexTemplateShowPath;
+    }
+
+    public void setIndexTemplateShowPath(String indexTemplateShowPath) {
+        this.indexTemplateShowPath = indexTemplateShowPath;
+    }
 }

src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java

@@ -0,0 +1,188 @@
+package com.tenlion.twoduty.service.indexauditlog;
+
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResultList;
+import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO;
+import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
+import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO;
+import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IIndexAuditLogService
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+public interface IIndexAuditLogService {
+
+    /**
+     * 新增指标审核日志表
+     *
+     * @param indexAuditLogVO
+     * @return
+     */
+    void save(IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 新增指标审核日志表
+     *
+     * @param token
+     * @param indexAuditLogVO
+     * @return
+     */
+    void save(String token, IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 新增指标审核日志表
+     *
+     * @param indexAuditLogVO
+     * @return indexAuditLogId
+     */
+    String saveReturnId(IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 新增指标审核日志表
+     *
+     * @param token
+     * @param indexAuditLogVO
+     * @return indexAuditLogId
+     */
+    String saveReturnId(String token, IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 删除指标审核日志表
+     *
+     * @param ids id列表
+     * @return
+     */
+    void remove(List<String> ids);
+
+
+    /**
+     * 删除指标审核日志表
+     *
+     * @param token
+     * @param ids id列表
+     * @return
+     */
+    void remove(String token, List<String> ids);
+
+    /**
+     * 删除指标审核日志表（物理删除）
+     *
+     * @param ids id列表
+     */
+    void delete(List<String> ids);
+
+    /**
+     * 修改指标审核日志表
+     *
+     * @param indexAuditLogId
+     * @param indexAuditLogVO
+     * @return
+     */
+    void update(String indexAuditLogId, IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 修改指标审核日志表
+     *
+     * @param token
+     * @param indexAuditLogId
+     * @param indexAuditLogVO
+     * @return
+     */
+    void update(String token, String indexAuditLogId, IndexAuditLogVO indexAuditLogVO);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    IndexAuditLogDTO get(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param indexAuditLogId
+     * @return
+     */
+    IndexAuditLogDTO get(String indexAuditLogId);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    IndexAuditLogBO getBO(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param indexAuditLogId
+     * @return
+     */
+    IndexAuditLogBO getBO(String indexAuditLogId);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    IndexAuditLogPO getPO(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表详情
+     *
+     * @param indexAuditLogId
+     * @return
+     */
+    IndexAuditLogPO getPO(String indexAuditLogId);
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     */
+    List<IndexAuditLogDTO> list(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     */
+    List<IndexAuditLogBO> listBO(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表列表
+     *
+     * @param params
+     * @return
+     */
+    List<IndexAuditLogPO> listPO(Map<String, Object> params);
+
+    /**
+     * 指标审核日志表分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<IndexAuditLogDTO>> listPage(ListPage page);
+
+    /**
+     * 指标审核日志表统计
+     *
+     * @param params
+     * @return
+     */
+    Integer count(Map<String, Object> params);
+
+}

src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java

@@ -0,0 +1,213 @@
+package com.tenlion.twoduty.service.indexauditlog.impl;
+
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
+import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
+import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService;
+import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.common.component.SecurityComponent;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResult;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.util.map.HashMapUtil;
+import ink.wgink.util.UUIDUtil;
+import com.tenlion.twoduty.dao.indexauditlog.IIndexAuditLogDao;
+import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO;
+import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
+import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO;
+import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO;
+import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @ClassName: IndexAuditLogServiceImpl
+ * @Description: 指标审核日志表
+ * @Author: CodeFactory
+ * @Date: 2021-04-23 11:05:28
+ * @Version: 3.0
+ **/
+@Service
+public class IndexAuditLogServiceImpl extends DefaultBaseService implements IIndexAuditLogService {
+
+    @Autowired
+    private IIndexAuditLogDao indexAuditLogDao;
+    @Autowired
+    private IIndexLibService iIndexLibService;
+    @Autowired
+    private IIndexTemplateService indexTemplateService;
+
+    public SuccessResultList<List<IndexAuditLogDTO>> listAuditPage(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<IndexAuditLogDTO> indexAuditLogDTOs = list(page.getParams());
+        PageInfo<IndexAuditLogDTO> pageInfo = new PageInfo<>(indexAuditLogDTOs);
+        return new SuccessResultList<>(indexAuditLogDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
+
+
+
+
+
+
+
+
+    @Override
+    public void save(IndexAuditLogVO indexAuditLogVO) {
+        saveReturnId(indexAuditLogVO);
+    }
+
+    @Override
+    public void save(String token, IndexAuditLogVO indexAuditLogVO) {
+        saveReturnId(token, indexAuditLogVO);
+    }
+
+    @Override
+    public String saveReturnId(IndexAuditLogVO indexAuditLogVO) {
+        indexAuditLogVO.setIndexAuditStatus("0");
+        indexAuditLogVO.setIndexAuditUserId("1");
+        return saveReturnId(null, indexAuditLogVO);
+    }
+
+    @Override
+    public String saveReturnId(String token, IndexAuditLogVO indexAuditLogVO) {
+        String indexAuditLogId = UUIDUtil.getUUID();
+        Map<String, Object> params = HashMapUtil.beanToMap(indexAuditLogVO);
+        params.put("indexAuditLogId", indexAuditLogId);
+        if (StringUtils.isBlank(token)) {
+            setSaveInfo(params);
+        } else {
+            setAppSaveInfo(token, params);
+        }
+        indexAuditLogDao.save(params);
+        return indexAuditLogId;
+    }
+
+    @Override
+    public void remove(List<String> ids) {
+        remove(null, ids);
+    }
+
+    @Override
+    public void remove(String token, List<String> ids) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("indexAuditLogIds", ids);
+        if (StringUtils.isBlank(token)) {
+            setUpdateInfo(params);
+        } else {
+            setAppUpdateInfo(token, params);
+        }
+        indexAuditLogDao.remove(params);
+    }
+
+    @Override
+    public void delete(List<String> ids) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("indexAuditLogIds", ids);
+        indexAuditLogDao.delete(params);
+    }
+
+    @Override
+    public void update(String indexAuditLogId, IndexAuditLogVO indexAuditLogVO) {
+        update(null, indexAuditLogId, indexAuditLogVO);
+    }
+
+    @Override
+    public void update(String token, String indexAuditLogId, IndexAuditLogVO indexAuditLogVO) {
+
+        Map<String, Object> params = HashMapUtil.beanToMap(indexAuditLogVO);
+        params.put("indexAuditLogId", indexAuditLogId);
+        if (StringUtils.isBlank(token)) {
+            setUpdateInfo(params);
+        } else {
+            setAppUpdateInfo(token, params);
+        }
+        indexAuditLogDao.update(params);
+        IndexAuditLogDTO indexAuditLogDTO =  this.get(indexAuditLogId);
+
+        IndexLibDTO indexLibDTO = iIndexLibService.get(indexAuditLogDTO.getIndexLibId());
+        if(indexLibDTO != null){
+            IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(indexLibDTO.getIndexTemplateId());
+            String tableName = indexTemplateDTO.getIndexTemplateTableName();
+            Map<String, Object> uParams = new HashMap<>();
+            uParams.put("type",tableName.substring(0,1));
+            uParams.put("tableName",tableName);
+            uParams.put("indexBId",indexAuditLogDTO.getIndexBId());
+            uParams.put("auditStatus",indexAuditLogVO.getIndexAuditStatus());
+            indexAuditLogDao.updateBAuditStatus(uParams);
+        }
+
+
+    }
+
+    @Override
+    public IndexAuditLogDTO get(Map<String, Object> params) {
+        return indexAuditLogDao.get(params);
+    }
+
+    @Override
+    public IndexAuditLogDTO get(String indexAuditLogId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("indexAuditLogId", indexAuditLogId);
+        return get(params);
+    }
+
+    @Override
+    public IndexAuditLogBO getBO(Map<String, Object> params) {
+        return indexAuditLogDao.getBO(params);
+    }
+
+    @Override
+    public IndexAuditLogBO getBO(String indexAuditLogId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("indexAuditLogId", indexAuditLogId);
+        return getBO(params);
+    }
+
+    @Override
+    public IndexAuditLogPO getPO(Map<String, Object> params) {
+        return indexAuditLogDao.getPO(params);
+    }
+
+    @Override
+    public IndexAuditLogPO getPO(String indexAuditLogId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("indexAuditLogId", indexAuditLogId);
+        return getPO(params);
+    }
+
+    @Override
+    public List<IndexAuditLogDTO> list(Map<String, Object> params) {
+        return indexAuditLogDao.list(params);
+    }
+
+    @Override
+    public List<IndexAuditLogBO> listBO(Map<String, Object> params) {
+        return indexAuditLogDao.listBO(params);
+    }
+
+    @Override
+    public List<IndexAuditLogPO> listPO(Map<String, Object> params) {
+        return indexAuditLogDao.listPO(params);
+    }
+
+    @Override
+    public SuccessResultList<List<IndexAuditLogDTO>> listPage(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<IndexAuditLogDTO> indexAuditLogDTOs = list(page.getParams());
+        PageInfo<IndexAuditLogDTO> pageInfo = new PageInfo<>(indexAuditLogDTOs);
+        return new SuccessResultList<>(indexAuditLogDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
+    @Override
+    public Integer count(Map<String, Object> params) {
+        Integer count = indexAuditLogDao.count(params);
+        return count == null ? 0 : count;
+    }
+
+}

src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java

@@ -1,5 +1,7 @@
 package com.tenlion.twoduty.service.indexgeneral.impl;
 
+import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
+import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.common.component.SecurityComponent;
@@ -34,7 +36,8 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
 
     @Autowired
     private IIndexGeneralDao indexGeneralDao;
-
+    @Autowired
+    private IIndexAuditLogService iIndexAuditLogService;
 
     @Override
     public void save(IndexGeneralVO indexGeneralVO) {
@@ -63,6 +66,11 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
             setAppSaveInfo(token, params);
         }
         indexGeneralDao.save(params);
+
+        IndexAuditLogVO auditLogVO = new IndexAuditLogVO();
+        auditLogVO.setIndexBId(indexGeneralId);
+        auditLogVO.setIndexLibId(indexGeneralVO.getDutyIndexLibId());
+        iIndexAuditLogService.save(auditLogVO);
         return indexGeneralId;
     }
 
@@ -106,6 +114,10 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
             setAppUpdateInfo(token, params);
         }
         indexGeneralDao.update(params);
+        IndexAuditLogVO auditLogVO = new IndexAuditLogVO();
+        auditLogVO.setIndexBId(indexGeneralId);
+        auditLogVO.setIndexLibId(indexGeneralVO.getDutyIndexLibId());
+        iIndexAuditLogService.save(auditLogVO);
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java

@@ -21,6 +21,13 @@ import java.util.Map;
  **/
 public interface IIndexLibService {
 
+    /**
+     * 获取web显示的指标
+     * @param indexLibParentId
+     * @return
+     */
+    List<IndexLibDTO> getWebIndexLibId(String indexLibParentId);
+
     /**
      * 统计指标状态数量
      * @param indexLibParentId

src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java

@@ -6,6 +6,7 @@ import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO;
 import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.common.component.SecurityComponent;
+import ink.wgink.exceptions.ParamsException;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -43,11 +44,13 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
     @Autowired
     private SecurityComponent securityComponent;
 
-    public IndexLibCountDTO countIndexLib(String indexLibParentId){
+    /**
-        Integer count1 = 0;
+     * 获取web显示的指标
-        Integer count2 = 0;
+     * @param indexLibParentId
-        Integer count3 = 0;
+     * @return
-        Integer count4 = 0;
+     */
+     public List<IndexLibDTO> getWebIndexLibId(String indexLibParentId){
+        List<IndexLibDTO> resultList = new ArrayList<>();
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("indexLibParentId",indexLibParentId);
         //查询指标分类树
@@ -58,23 +61,34 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
             params.put("indexLibParentId",indexLibZTreeDTO.getId());
             //查询具体指标
             List<IndexLibDTO> list = this.list(params);
-            for (IndexLibDTO indexLibDTO : list) {
+            resultList.addAll(list);
-                String templateId = indexLibDTO.getIndexTemplateId();
+        }
-                if (!StringUtils.isBlank(templateId)) {
+        return resultList;
-                    IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(templateId);
+    }
-                    String templateTableName = indexTemplateDTO.getIndexTemplateTableName();
+
-                    if (!StringUtils.isBlank(templateTableName)) {
+
-                        //统计
+
-                        Map<String, Object> counts = new HashMap<String, Object>();
+    public IndexLibCountDTO countIndexLib(String indexLibParentId){
-                        counts.put("tableName",templateTableName);
+        Integer count1 = 0;
-                        counts.put("indexLibId",indexLibDTO.getIndexLibId());
+        Integer count2 = 0;
-                        counts.put("creator",securityComponent.getCurrentUser().getUserId());
+        Integer count3 = 0;
-                        IndexLibCountDTO indexLibCountDTO = indexLibDao.countIndexLibAuditStatusNum(counts);
+        Integer count4 = 0;
-                        count1 += indexLibCountDTO.getCount1();
+        for (IndexLibDTO indexLibDTO : this.getWebIndexLibId(indexLibParentId)) {
-                        count2 += indexLibCountDTO.getCount2();
+            String templateId = indexLibDTO.getIndexTemplateId();
-                        count3 += indexLibCountDTO.getCount3();
+            if (!StringUtils.isBlank(templateId)) {
-                        count4 += indexLibCountDTO.getCount4();
+                IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(templateId);
-                    }
+                String templateTableName = indexTemplateDTO.getIndexTemplateTableName();
+                if (!StringUtils.isBlank(templateTableName)) {
+                    //统计
+                    Map<String, Object> counts = new HashMap<String, Object>();
+                    counts.put("tableName",templateTableName);
+                    counts.put("indexLibId",indexLibDTO.getIndexLibId());
+                    counts.put("creator",securityComponent.getCurrentUser().getUserId());
+                    IndexLibCountDTO indexLibCountDTO = indexLibDao.countIndexLibAuditStatusNum(counts);
+                    count1 += indexLibCountDTO.getCount1();
+                    count2 += indexLibCountDTO.getCount2();
+                    count3 += indexLibCountDTO.getCount3();
+                    count4 += indexLibCountDTO.getCount4();
                 }
             }
         }
@@ -195,6 +209,17 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
         if(dto.getIndexLibParentId().equals("0")){
             dto.setIndexLibParentName("根节点");
         }
+        if (!StringUtils.isBlank(dto.getIndexTemplateId())){
+            IndexTemplateDTO indexTemplateDTO =  indexTemplateService.get(dto.getIndexTemplateId());
+            if(indexTemplateDTO != null){
+                dto.setIndexTemplateListPath(indexTemplateDTO.getIndexTemplateListPath());
+                dto.setIndexTemplateSavePath(indexTemplateDTO.getIndexTemplateSavePath());
+                dto.setIndexTemplateShowPath(indexTemplateDTO.getIndexTemplateShowPath());
+                dto.setIndexTemplateUploadPath(indexTemplateDTO.getIndexTemplateUploadPath());
+            }
+        }
+
+
         return dto;
     }
 

src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml

@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tenlion.twoduty.dao.indexauditlog.IIndexAuditLogDao">
+
+    <resultMap id="indexAuditLogDTO" type="com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO">
+        <result column="index_audit_log_id" property="indexAuditLogId"/>
+        <result column="index_b_id" property="indexBId"/>
+        <result column="index_lib_id" property="indexLibId"/>
+        <result column="index_audit_status" property="indexAuditStatus"/>
+        <result column="index_audit_result" property="indexAuditResult"/>
+        <result column="index_audit_user_id" property="indexAuditUserId"/>
+    </resultMap>
+
+    <resultMap id="indexAuditLogBO" type="com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO">
+        <result column="index_audit_log_id" property="indexAuditLogId"/>
+        <result column="index_b_id" property="indexBId"/>
+        <result column="index_lib_id" property="indexLibId"/>
+        <result column="index_audit_status" property="indexAuditStatus"/>
+        <result column="index_audit_result" property="indexAuditResult"/>
+        <result column="index_audit_user_id" property="indexAuditUserId"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="modifier" property="modifier"/>
+        <result column="is_delete" property="isDelete"/>
+    </resultMap>
+
+    <resultMap id="indexAuditLogPO" type="com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO">
+        <result column="index_audit_log_id" property="indexAuditLogId"/>
+        <result column="index_b_id" property="indexBId"/>
+        <result column="index_lib_id" property="indexLibId"/>
+        <result column="index_audit_status" property="indexAuditStatus"/>
+        <result column="index_audit_result" property="indexAuditResult"/>
+        <result column="index_audit_user_id" property="indexAuditUserId"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="modifier" property="modifier"/>
+        <result column="is_delete" property="isDelete"/>
+    </resultMap>
+
+    <!-- 新增指标审核日志表 -->
+    <insert id="save" parameterType="map">
+        INSERT INTO duty_index_audit_log(
+            index_audit_log_id,
+            index_b_id,
+            index_lib_id,
+            index_audit_status,
+            index_audit_result,
+            index_audit_user_id,
+            gmt_create,
+            creator,
+            gmt_modified,
+            modifier,
+            is_delete
+        ) VALUES(
+            #{indexAuditLogId},
+            #{indexBId},
+            #{indexLibId},
+            #{indexAuditStatus},
+            #{indexAuditResult},
+            #{indexAuditUserId},
+            #{gmtCreate},
+            #{creator},
+            #{gmtModified},
+            #{modifier},
+            #{isDelete}
+        )
+    </insert>
+
+    <!-- 删除指标审核日志表 -->
+    <update id="remove" parameterType="map">
+        UPDATE
+            duty_index_audit_log
+        SET
+            gmt_modified = #{gmtModified},
+            modifier = #{modifier},
+            is_delete = 1
+        WHERE
+            index_audit_log_id IN
+        <foreach collection="indexAuditLogIds" index="index" open="(" separator="," close=")">
+            #{indexAuditLogIds[${index}]}
+        </foreach>
+    </update>
+
+    <!-- 删除指标审核日志表（物理） -->
+    <update id="delete" parameterType="map">
+        DELETE FROM
+            duty_index_audit_log
+        WHERE
+            index_audit_log_id IN
+        <foreach collection="indexAuditLogIds" index="index" open="(" separator="," close=")">
+            #{indexAuditLogIds[${index}]}
+        </foreach>
+    </update>
+
+    <!-- 修改指标审核日志表 -->
+    <update id="update" parameterType="map">
+        UPDATE
+            duty_index_audit_log
+        SET
+        <if test="indexAuditStatus != null and indexAuditStatus != ''">
+            index_audit_status = #{indexAuditStatus},
+        </if>
+        <if test="indexAuditResult != null and indexAuditResult != ''">
+            index_audit_result = #{indexAuditResult},
+        </if>
+            gmt_modified = #{gmtModified},
+            modifier = #{modifier}
+        WHERE
+            index_audit_log_id = #{indexAuditLogId}
+    </update>
+
+    <!-- 指标审核日志表详情 -->
+    <select id="get" parameterType="map" resultMap="indexAuditLogDTO">
+        SELECT
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id,
+            t1.index_audit_log_id
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+            <if test="indexAuditLogId != null and indexAuditLogId != ''">
+        AND
+            t1.index_audit_log_id = #{indexAuditLogId}
+            </if>
+    </select>
+
+    <!-- 指标审核日志表详情 -->
+    <select id="getBO" parameterType="map" resultMap="indexAuditLogBO">
+        SELECT
+            t1.index_audit_log_id,
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id,
+            t1.gmt_create,
+            t1.creator,
+            t1.gmt_modified,
+            t1.modifier,
+            t1.is_delete
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+            <if test="indexAuditLogId != null and indexAuditLogId != ''">
+        AND
+            t1.index_audit_log_id = #{indexAuditLogId}
+            </if>
+    </select>
+
+    <!-- 指标审核日志表详情 -->
+    <select id="getPO" parameterType="map" resultMap="indexAuditLogPO">
+        SELECT
+            t1.index_audit_log_id,
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id,
+            t1.gmt_create,
+            t1.creator,
+            t1.gmt_modified,
+            t1.modifier,
+            t1.is_delete
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+            <if test="indexAuditLogId != null and indexAuditLogId != ''">
+        AND
+            t1.index_audit_log_id = #{indexAuditLogId}
+            </if>
+    </select>
+
+    <!-- 指标审核日志表列表 -->
+    <select id="list" parameterType="map" resultMap="indexAuditLogDTO">
+        SELECT
+            t1.index_audit_log_id,
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="indexLibIds != null and indexLibIds.size > 0">
+        AND
+            t1.index_lib_id IN
+            <foreach collection="indexLibIds" index="index" open="(" separator="," close=")">
+                #{indexLibIds[${index}]}
+            </foreach>
+        </if>
+        <if test="indexAuditUserId != null and indexAuditUserId != ''">
+           AND t1.index_audit_user_id = #{indexAuditUserId}
+        </if>
+        ORDER BY t1.gmt_create DESC
+    </select>
+
+    <!-- 指标审核日志表列表 -->
+    <select id="listBO" parameterType="map" resultMap="indexAuditLogBO">
+        SELECT
+            t1.index_audit_log_id,
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id,
+            t1.gmt_create,
+            t1.creator,
+            t1.gmt_modified,
+            t1.modifier,
+            t1.is_delete
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="indexAuditLogIds != null and indexAuditLogIds.size > 0">
+        AND
+            t1.index_audit_log_id IN
+            <foreach collection="indexAuditLogIds" index="index" open="(" separator="," close=")">
+                #{indexAuditLogIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
+    <!-- 指标审核日志表列表 -->
+    <select id="listPO" parameterType="map" resultMap="indexAuditLogPO">
+        SELECT
+            t1.index_audit_log_id,
+            t1.index_b_id,
+            t1.index_lib_id,
+            t1.index_audit_status,
+            t1.index_audit_result,
+            t1.index_audit_user_id,
+            t1.gmt_create,
+            t1.creator,
+            t1.gmt_modified,
+            t1.modifier,
+            t1.is_delete
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="indexAuditLogIds != null and indexAuditLogIds.size > 0">
+        AND
+            t1.index_audit_log_id IN
+            <foreach collection="indexAuditLogIds" index="index" open="(" separator="," close=")">
+                #{indexAuditLogIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
+    <!-- 指标审核日志表统计  -->
+    <select id="count" parameterType="map" resultType="Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            duty_index_audit_log t1
+        WHERE
+            t1.is_delete = 0
+    </select>
+
+
+
+
+    <!-- 修改指标审核日志表 -->
+    <update id="updateBAuditStatus" parameterType="map">
+        UPDATE
+         #{tableName}
+        SET
+            audit_status = #{auditStatus}
+        WHERE
+            is_delete = 0
+           <if test="type == 't'.toString()">
+               AND report_id = #{indexBId}
+           </if>
+            <if test="type == 'd'.toString()">
+                AND index_general_id = #{indexBId}
+           </if>
+    </update>
+
+
+</mapper>

src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml

@@ -442,7 +442,6 @@
         <if test="creator != '1'.toString()">
             AND creator = #{creator}
         </if>
-
     </select>
 
 </mapper>

src/main/resources/mybatis/mapper/indextemplate/indexTemplate-mapper.xml

@@ -7,6 +7,7 @@
         <result column="index_template_name" property="indexTemplateName"/>
         <result column="index_template_save_path" property="indexTemplateSavePath"/>
         <result column="index_template_upload_path" property="indexTemplateUploadPath"/>
+        <result column="index_template_show_path" property="indexTemplateShowPath"/>
         <result column="index_template_list_path" property="indexTemplateListPath"/>
         <result column="index_template_table_name" property="indexTemplateTableName"/>
         <result column="index_template_remark" property="indexTemplateRemark"/>
@@ -18,6 +19,7 @@
         <result column="index_template_name" property="indexTemplateName"/>
         <result column="index_template_save_path" property="indexTemplateSavePath"/>
         <result column="index_template_upload_path" property="indexTemplateUploadPath"/>
+        <result column="index_template_show_path" property="indexTemplateShowPath"/>
         <result column="index_template_list_path" property="indexTemplateListPath"/>
         <result column="index_template_table_name" property="indexTemplateTableName"/>
         <result column="index_template_remark" property="indexTemplateRemark"/>
@@ -34,6 +36,7 @@
         <result column="index_template_name" property="indexTemplateName"/>
         <result column="index_template_save_path" property="indexTemplateSavePath"/>
         <result column="index_template_upload_path" property="indexTemplateUploadPath"/>
+        <result column="index_template_show_path" property="indexTemplateShowPath"/>
         <result column="index_template_list_path" property="indexTemplateListPath"/>
         <result column="index_template_table_name" property="indexTemplateTableName"/>
         <result column="index_template_remark" property="indexTemplateRemark"/>
@@ -52,6 +55,7 @@
             index_template_name,
             index_template_save_path,
             index_template_upload_path,
+            index_template_show_path,
             index_template_list_path,
             index_template_table_name,
             index_template_remark,
@@ -66,6 +70,7 @@
             #{indexTemplateName},
             #{indexTemplateSavePath},
             #{indexTemplateUploadPath},
+            #{indexTemplateShowPath},
             #{indexTemplateListPath},
             #{indexTemplateTableName}
             #{indexTemplateRemark},
@@ -118,6 +123,7 @@
         index_template_name = #{indexTemplateName},
         index_template_save_path = #{indexTemplateSavePath},
         index_template_upload_path = #{indexTemplateUploadPath},
+        index_template_show_path = #{indexTemplateShowPath},
         index_template_list_path = #{indexTemplateListPath},
         index_template_table_name = #{indexTemplateTableName},
         index_template_remark = #{indexTemplateRemark},
@@ -133,6 +139,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,
@@ -155,6 +162,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,
@@ -180,6 +188,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,
@@ -205,6 +214,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,
@@ -235,6 +245,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,
@@ -269,6 +280,7 @@
         t1.index_template_name,
         t1.index_template_save_path,
         t1.index_template_upload_path,
+        t1.index_template_show_path,
         t1.index_template_list_path,
         t1.index_template_table_name,
         t1.index_template_remark,

src/main/resources/static/route/basiccheckpersonaction/list.html

@@ -294,7 +294,7 @@
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/basicCheckPersonAction/show.html?reportId={reportId}',
+                    content: top.restAjax.path('route/basiccheckpersonaction/show.html?reportId={reportId}',
                         [obj.data.reportId]),
                     end: function() {
                         reloadTable();

src/main/resources/static/route/basiccheckpersoninfo/list.html

@@ -356,7 +356,7 @@
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/basicCheckPersonInfo/show.html?reportId={reportId}',
+                    content: top.restAjax.path('route/basiccheckpersoninfo/show.html?reportId={reportId}',
                         [obj.data.reportId]),
                     end: function() {
                         reloadTable();

src/main/resources/static/route/indexauditlog/list-audit.html

@@ -0,0 +1,243 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/twoduty/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/indexauditlog/listauditpage/{indexLibId}';
+        var indexLibId = top.restAjax.params(window.location.href).indexLibId;
+
+
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, [indexLibId]),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'indexLibName', width: 180, title: '审核人', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexLibName', width: 180, title: '审核人', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexAuditStatus', width: 180, title: '审核状态', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                if ('0' == rowData){
+                                    return '待审核';
+                                }
+                                if ('1' == rowData){
+                                    return '审核通过';
+                                }
+                                if ('2' == rowData){
+                                    return '已归档';
+                                }
+                                if ('-1' == rowData){
+                                    return '审核不通过';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexAuditUserName', width: 180, title: '审核人', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'cz', width: 180, title: '操作', align:'center',fixed: 'right',
+                            templet: function(row) {
+                                var indexAuditStatus = row['indexAuditStatus'];
+                                var rowData = '<div class="layui-btn-group">';
+                                rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="show">查看</button>';
+                                if (indexAuditStatus == -1) {
+                                    rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="update">重新上报</button>';
+                                }
+                                rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>';
+                                if (indexAuditStatus == 0) {
+                                    rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audit">审核</button>';
+                                }
+                                rowData +='</div>';
+                                return rowData;
+                            }
+                        }
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, [indexLibId]),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/indexauditlog/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        initDate();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var data = obj.data;
+            if(layEvent === 'audit') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/indexauditlog/save.html?indexLibId={indexLibId}&indexBId={indexBId}&indexAuditLogId={indexAuditLogId}',
+                        [data.indexLibId,data.indexBId,data.indexAuditLogId]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            }
+        });
+
+
+
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/indexauditlog/list.html

@@ -0,0 +1,267 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/twoduty/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/indexauditlog/listpage/{indexLibId}';
+
+
+
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'indexAuditLogId', width: 180, title: '主键', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexBId', width: 180, title: '指标业务ID', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexAuditStatus', width: 180, title: '审核状态：0 待审核 1审核通过 2已归档 -1审核不通过', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexAuditResult', width: 180, title: '审核内容', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'indexAuditUserId', width: 180, title: '审核人ID', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/indexauditlog/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        initDate();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/indexauditlog/save.html', []),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/indexauditlog/update.html?indexAuditLogId={indexAuditLogId}', [checkDatas[0].indexAuditLogId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['indexAuditLogId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/indexauditlog/save.html

@@ -0,0 +1,131 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/twoduty/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-card">
+        <div class="layui-card-header">
+            <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
+              <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
+              <a href="javascript:void(0);"><cite>新增内容</cite></a>
+            </span>
+        </div>
+        <div class="layui-card-body" style="padding: 15px;">
+            <form class="layui-form layui-form-pane" lay-filter="dataForm">
+                <iframe src="" id="bFrame" style="width: 100%;height: 500px">
+
+
+                </iframe>
+
+                <div class="layui-form-item  layui-form-text">
+                    <label class="layui-form-label">审核内容</label>
+                    <div class="layui-input-block">
+                        <textarea id="indexAuditResult" name="indexAuditResult" placeholder="请输入内容" class="layui-textarea"  placeholder="请输入审核内容"></textarea>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-layout-admin">
+                    <div class="layui-input-block">
+                        <div class="layui-footer" style="left: 0;">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm" value="1">通过</button>
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm" value="-1">不通过</button>
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm" value="2">通过并归档</button>
+                            <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
+<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'laydate', 'laytpl'], function(){
+        var $ = layui.$;
+        var form = layui.form;
+        var laytpl = layui.laytpl;
+        var laydate = layui.laydate;
+        var wangEditor = window.wangEditor;
+        var wangEditorObj = {};
+        var viewerObj = {};
+        var indexLibId = top.restAjax.params(window.location.href).indexLibId;
+        var indexBId = top.restAjax.params(window.location.href).indexBId;
+        var indexAuditLogId = top.restAjax.params(window.location.href).indexAuditLogId;
+
+
+        function closeBox() {
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
+        }
+
+        // 初始化内容
+        function initData() {
+            var loadLayerIndex;
+            top.restAjax.get(top.restAjax.path('api/indexlib/get/{indexLibId}', [indexLibId]), {}, null, function(code, data) {
+                $("#bFrame").attr('src',data.indexTemplateShowPath+indexBId)
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            }, function() {
+                loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
+            }, function() {
+                top.dialog.close(loadLayerIndex);
+            });
+        }
+        initData();
+
+        // 提交表单
+        form.on('submit(submitForm)', function(formData) {
+            formData.field.indexAuditStatus = $(this).val();
+            top.dialog.confirm(top.dataMessage.commit, function(index) {
+                top.dialog.close(index);
+                var loadLayerIndex;
+                top.restAjax.put(top.restAjax.path('api/indexauditlog/update/{indexAuditLogId}', [indexAuditLogId]), formData.field, null, function(code, data) {
+                    var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
+                        time: 0,
+                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                        shade: 0.3,
+                        yes: function(index) {
+                            top.dialog.close(index);
+                            window.location.reload();
+                        },
+                        btn2: function() {
+                            closeBox();
+                        }
+                    });
+                }, function(code, data) {
+                    top.dialog.msg(data.msg);
+                }, function() {
+                    loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+                }, function() {
+                    top.dialog.close(loadLayerIndex);
+                });
+            });
+            return false;
+        });
+
+        $('.close').on('click', function() {
+            closeBox();
+        });
+
+        // 校验
+        form.verify({
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/indexauditlog/update.html

@@ -0,0 +1,195 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/twoduty/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-card">
+        <div class="layui-card-header">
+            <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
+              <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
+              <a href="javascript:void(0);"><cite>编辑内容</cite></a>
+            </span>
+        </div>
+        <div class="layui-card-body" style="padding: 15px;">
+            <form class="layui-form layui-form-pane" lay-filter="dataForm">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">指标业务ID</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexBId" name="indexBId" class="layui-input" value="" placeholder="请输入指标业务ID"  maxlength="36">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">审核状态：0 待审核 1审核通过 2已归档 -1审核不通过</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexAuditStatus" name="indexAuditStatus" class="layui-input" value="" placeholder="请输入审核状态：0 待审核 1审核通过 2已归档 -1审核不通过"  maxlength="10">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">审核内容</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexAuditResult" name="indexAuditResult" class="layui-input" value="" placeholder="请输入审核内容"  maxlength="500">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">审核人ID</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexAuditUserId" name="indexAuditUserId" class="layui-input" value="" placeholder="请输入审核人ID"  maxlength="36">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-layout-admin">
+                    <div class="layui-input-block">
+                        <div class="layui-footer" style="left: 0;">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交编辑</button>
+                            <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
+<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'laydate', 'laytpl'], function(){
+        var $ = layui.$;
+        var form = layui.form;
+        var laytpl = layui.laytpl;
+        var laydate = layui.laydate;
+        var indexAuditLogId = top.restAjax.params(window.location.href).indexAuditLogId;
+
+        var wangEditor = window.wangEditor;
+        var wangEditorObj = {};
+        var viewerObj = {};
+
+        function closeBox() {
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
+        }
+
+        function refreshDownloadTemplet(fileName, file) {
+            var dataRander = {};
+            dataRander[fileName] = file;
+
+            laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
+                document.getElementById(fileName +'FileBox').innerHTML = html;
+            });
+        }
+
+        // 初始化文件列表
+        function initFileList(fileName, ids, callback) {
+            var dataForm = {};
+            dataForm[fileName] = ids;
+            form.val('dataForm', dataForm);
+
+            if(!ids) {
+                refreshDownloadTemplet(fileName, []);
+                if(callback) {
+                    callback(fileName, []);
+                }
+                return;
+            }
+
+            top.restAjax.get(top.restAjax.path('api/file/list', []), {
+                ids: ids
+            }, null, function(code, data) {
+                refreshDownloadTemplet(fileName, data);
+                if(callback) {
+                    callback(fileName, data);
+                }
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
+        // 初始化视频
+        function initVideo(fileName, data) {
+            for(var i = 0, item; item = data[i++];) {
+                var player = new ckplayer({
+                    container: '#'+ fileName + i,
+                    variable: 'player',
+                    flashplayer: false,
+                    video: {
+                        file: 'route/file/download/true/'+ item.fileId,
+                        type: 'video/mp4'
+                    }
+                });
+            }
+        }
+
+
+        // 初始化内容
+        function initData() {
+            var loadLayerIndex;
+            top.restAjax.get(top.restAjax.path('api/indexauditlog/get/{indexAuditLogId}', [indexAuditLogId]), {}, null, function(code, data) {
+                var dataFormData = {};
+                for(var i in data) {
+                    dataFormData[i] = data[i] +'';
+                }
+                form.val('dataForm', dataFormData);
+                form.render(null, 'dataForm');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            }, function() {
+                loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
+            }, function() {
+                top.dialog.close(loadLayerIndex);
+            });
+        }
+        initData();
+        
+        // 提交表单
+        form.on('submit(submitForm)', function(formData) {
+            top.dialog.confirm(top.dataMessage.commit, function(index) {
+                top.dialog.close(index);
+                var loadLayerIndex;
+                top.restAjax.put(top.restAjax.path('api/indexauditlog/update/{indexAuditLogId}', [indexAuditLogId]), formData.field, null, function(code, data) {
+                    var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
+                        time: 0,
+                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                        shade: 0.3,
+                        yes: function(index) {
+                            top.dialog.close(index);
+                            window.location.reload();
+                        },
+                        btn2: function() {
+                            closeBox();
+                        }
+                    });
+                }, function(code, data) {
+                    top.dialog.msg(data.msg);
+                }, function() {
+                    loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+                }, function() {
+                    top.dialog.close(loadLayerIndex);
+                });
+            });
+            return false;
+        });
+
+        $('.close').on('click', function() {
+            closeBox();
+        });
+
+        // 校验
+        form.verify({
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/indexgeneral/list.html

@@ -335,7 +335,7 @@
                     area: ['100%', '100%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/indexGeneral/show.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]),
+                    content: top.restAjax.path('route/indexgeneral/show.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]),
                     end: function() {
                         reloadTable();
                     }

src/main/resources/static/route/indexlib/tree.html

@@ -49,7 +49,7 @@
 
         // 初始化IFrame
         function initIFrame() {
-            $('#listContent').attr('src', top.restAjax.path('route/indexLib/list.html?indexLibParentId={indexLibParentId}', [indexLibParentId]));
+            $('#listContent').attr('src', top.restAjax.path('route/indexlib/list.html?indexLibParentId={indexLibParentId}', [indexLibParentId]));
         }
         // 初始化大小
         function initSize() {

src/main/resources/static/route/indextemplate/list.html

@@ -111,6 +111,14 @@
                                 }
                                 return rowData;
                             }
+                        }, {field: 'indexTemplateShowPath', width: 180, title: '显示路径', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
                         }, {field: 'indexTemplateListPath', width: 180, title: '列表路径', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];

src/main/resources/static/route/indextemplate/save.html

@@ -40,6 +40,12 @@
                         <input type="text" id="indexTemplateUploadPath" name="indexTemplateUploadPath" class="layui-input" value="" placeholder="请输入修改路径"  maxlength="150">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">显示路径</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexTemplateShowPath" name="indexTemplateShowPath" class="layui-input" value="" placeholder="请输入显示路径"  maxlength="150">
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">列表路径</label>
                     <div class="layui-input-block">

src/main/resources/static/route/indextemplate/update.html

@@ -40,6 +40,12 @@
                         <input type="text" id="indexTemplateUploadPath" name="indexTemplateUploadPath" class="layui-input" value="" placeholder="请输入修改路径"  maxlength="150">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">显示路径</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="indexTemplateShowPath" name="indexTemplateShowPath" class="layui-input" value="" placeholder="请输入显示路径"  maxlength="150">
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">列表路径</label>
                     <div class="layui-input-block">

src/main/resources/static/route/partypunishinfo/list.html

@@ -293,7 +293,7 @@
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/partyPunishInfo/show.html?reportId={reportId}',
+                    content: top.restAjax.path('route/partypunishinfo/show.html?reportId={reportId}',
                         [obj.data.reportId]),
                     end: function() {
                         reloadTable();

src/main/resources/static/route/problemclue/list.html

@@ -391,7 +391,7 @@
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/problemClue/show.html?reportId={reportId}',
+                    content: top.restAjax.path('route/problemclue/show.html?reportId={reportId}',
                         [obj.data.reportId]),
                     end: function() {
                         reloadTable();

src/main/resources/static/route/supervisecheck/list.html

@@ -293,7 +293,7 @@
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/superviseCheck/show.html?reportId={reportId}',
+                    content: top.restAjax.path('route/supervisecheck/show.html?reportId={reportId}',
                         [obj.data.reportId]),
                     end: function() {
                         reloadTable();

src/main/resources/templates/index.html

@@ -19,7 +19,7 @@
                     <a href="javascript: void(0);">
                         <div class="left fl">
                             <span>首页</span>
-                            <p>乡镇街道综合办公平台</p>
+                            <p>${systemTitle}</p>
                         </div>
                         <div class="right fr">
                             <img src="assets/web/images/nav-icon1.png" alt="">