Tenlion/twoduty
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增审核功能

Browse Source
This commit is contained in:
ly19960718 2021-06-17 10:08:50 +08:00
parent fa9c22aead
commit 72189bab61
40 changed files with 3313 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/main/java/com/tenlion/twoduty/controller/api/indexaudit/IndexAuditController.java Normal file
View File

@ -0,0 +1,111 @@
package com.tenlion.twoduty.controller.api.indexaudit;
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.indexaudit.IndexAuditDTO;
import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
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: IndexAuditController
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "指标审核表接口")
@RestController
@RequestMapping(ISystemConstant.API_PREFIX + "/indexaudit")
public class IndexAuditController extends DefaultBaseController {
@Autowired
private IIndexAuditService indexAuditService;
@ApiOperation(value = "新增指标审核表", notes = "新增指标审核表接口")
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@PostMapping("save")
@CheckRequestBodyAnnotation
public SuccessResult save(@RequestBody IndexAuditVO indexAuditVO) {
indexAuditService.save(indexAuditVO);
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) {
indexAuditService.remove(Arrays.asList(ids.split("\\_")));
return new SuccessResult();
}
@ApiOperation(value = "修改指标审核表", notes = "修改指标审核表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "indexAuditId", value = "指标审核表ID", paramType = "path")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@PutMapping("update/{indexAuditId}")
@CheckRequestBodyAnnotation
public SuccessResult update(@PathVariable("indexAuditId") String indexAuditId, @RequestBody IndexAuditVO indexAuditVO) {
indexAuditService.update(indexAuditId, indexAuditVO);
return new SuccessResult();
}
@ApiOperation(value = "指标审核表详情", notes = "指标审核表详情接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "indexAuditId", value = "指标审核表ID", paramType = "path")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("get/{indexAuditId}")
public IndexAuditDTO get(@PathVariable("indexAuditId") String indexAuditId) {
return indexAuditService.get(indexAuditId);
}
@ApiOperation(value = "指标审核表列表", notes = "指标审核表列表接口")
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("list")
public List<IndexAuditDTO> list() {
Map<String, Object> params = requestParams();
return indexAuditService.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<IndexAuditDTO>> listPage(ListPage page) {
Map<String, Object> params = requestParams();
page.setParams(params);
return indexAuditService.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<>(indexAuditService.count(params));
}
}

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

@ -1,10 +1,7 @@
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;
@ -18,7 +15,6 @@ 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;
@ -27,7 +23,7 @@ import java.util.Map;
* @ClassName: IndexAuditLogController
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @Version: 3.0
**/
@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "指标审核日志表接口")
@ -37,35 +33,6 @@ 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)})

66
src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java
View File

@ -4,6 +4,8 @@ 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.pojo.bos.UserInfoBO;
import ink.wgink.pojo.pos.RolePO;
import ink.wgink.properties.ServerProperties;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.List;
/**
* TODO
* @version 1.0
@ -28,16 +33,73 @@ public class indexWebController extends DefaultBaseController {
@Autowired
private ServerProperties serverProperties;
/**
* 市局角色
*/
private final static String ROLE_CODE_1 ="0001";
/**
* 旗县角色
*/
private final static String ROLE_CODE_2 ="0002";
@ApiOperation(value = "后台页面首页", notes = "后台页面首页接口")
@GetMapping("indexweb")
public ModelAndView indexWeb(){
ModelAndView mv = new ModelAndView("index");
mv.addObject("userName",securityComponent.getCurrentUser().getUserName());
mv.addObject("userUserName",securityComponent.getCurrentUser().getUserUsername());
UserInfoBO currentUser = securityComponent.getCurrentUser();
mv.addObject("userName",currentUser.getUserName());
mv.addObject("userUserName",currentUser.getUserUsername());
mv.addObject("systemTitle",serverProperties.getSystemTitle());
return mv;
}
@ApiOperation(value = "后台统计页面",notes = "后台统计页面接口")
@GetMapping("indexcount")
public ModelAndView indexCount(){
ModelAndView mv = new ModelAndView();
List<RolePO> roles = securityComponent.getCurrentUser().getRoles();
if(roles.size() == 0){
mv.setViewName("default-home");
return mv;
}
for (RolePO role : roles) {
if(ROLE_CODE_1.equals(role.getRoleCode())){
mv.setViewName("count_role_1");
break;
}
if(ROLE_CODE_2.equals(role.getRoleCode())){
mv.setViewName("count_role_2");
break;
}
}
return mv;
}
public List<String> initWebButton(UserInfoBO currentUser){
List<String> list = new ArrayList<>();
List<RolePO> roles = currentUser.getRoles();
if(roles.size() == 0){
return list;
}
for (RolePO role : roles) {
if(ROLE_CODE_1.equals(role.getRoleCode())){
list.add("1");
list.add("2");
}
if(ROLE_CODE_2.equals(role.getRoleCode())){
list.add("3");
}
}
return list;
}
}

120
src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java Normal file
View File

@ -0,0 +1,120 @@
package com.tenlion.twoduty.dao.indexaudit;
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.indexaudit.IndexAuditBO;
import com.tenlion.twoduty.pojo.pos.indexaudit.IndexAuditPO;
import com.tenlion.twoduty.pojo.dtos.indexaudit.IndexAuditDTO;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
* @ClassName: IIndexAuditDao
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
@Repository
public interface IIndexAuditDao {
/**
* 新增指标审核表
*
* @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
*/
IndexAuditDTO get(Map<String, Object> params) throws SearchException;
/**
* 指标审核表详情
*
* @param params
* @return
* @throws SearchException
*/
IndexAuditBO getBO(Map<String, Object> params) throws SearchException;
/**
* 指标审核表详情
*
* @param params
* @return
* @throws SearchException
*/
IndexAuditPO getPO(Map<String, Object> params) throws SearchException;
/**
* 指标审核表列表
*
* @param params
* @return
* @throws SearchException
*/
List<IndexAuditDTO> list(Map<String, Object> params) throws SearchException;
/**
* 指标审核表列表
*
* @param params
* @return
* @throws SearchException
*/
List<IndexAuditBO> listBO(Map<String, Object> params) throws SearchException;
/**
* 指标审核表列表
*
* @param params
* @return
* @throws SearchException
*/
List<IndexAuditPO> listPO(Map<String, Object> params) throws SearchException;
/**
* 指标审核表统计
*
* @param params
* @return
* @throws SearchException
*/
Integer count(Map<String, Object> params) throws SearchException;
}

9
src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java
View File

@ -16,19 +16,12 @@ import java.util.Map;
* @ClassName: IIndexAuditLogDao
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @Version: 3.0
**/
@Repository
public interface IIndexAuditLogDao {
/**
* 修改业务表审核状态
* @param params
* @throws UpdateException
*/
void updateBAuditStatus(Map<String, Object> params) throws UpdateException;
/**
* 新增指标审核日志表
*

114
src/main/java/com/tenlion/twoduty/pojo/bos/indexaudit/IndexAuditBO.java Normal file
View File

@ -0,0 +1,114 @@
package com.tenlion.twoduty.pojo.bos.indexaudit;
/**
*
* @ClassName: IndexAuditBO
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
public class IndexAuditBO {
private String indexAuditId;
private String indexLibId;
private String indexBId;
private String indexBTitle;
private Integer indexAuditStatus;
private String indexAuditUserId;
private String creator;
private String gmtCreate;
private String modifier;
private String gmtModified;
private Integer isDelete;
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexLibId() {
return indexLibId == null ? "" : indexLibId.trim();
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
}
public String getIndexBTitle() {
return indexBTitle == null ? "" : indexBTitle.trim();
}
public void setIndexBTitle(String indexBTitle) {
this.indexBTitle = indexBTitle;
}
public Integer getIndexAuditStatus() {
return indexAuditStatus == null ? 0 : indexAuditStatus;
}
public void setIndexAuditStatus(Integer indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
}
public String getIndexAuditUserId() {
return indexAuditUserId == null ? "" : indexAuditUserId.trim();
}
public void setIndexAuditUserId(String indexAuditUserId) {
this.indexAuditUserId = indexAuditUserId;
}
public String getCreator() {
return creator == null ? "" : creator.trim();
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getGmtCreate() {
return gmtCreate == null ? "" : gmtCreate.trim();
}
public void setGmtCreate(String gmtCreate) {
this.gmtCreate = gmtCreate;
}
public String getModifier() {
return modifier == null ? "" : modifier.trim();
}
public void setModifier(String modifier) {
this.modifier = modifier;
}
public String getGmtModified() {
return gmtModified == null ? "" : gmtModified.trim();
}
public void setGmtModified(String gmtModified) {
this.gmtModified = gmtModified;
}
public Integer getIsDelete() {
return isDelete == null ? 0 : isDelete;
}
public void setIsDelete(Integer isDelete) {
this.isDelete = isDelete;
}
}

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

@ -5,22 +5,17 @@ package com.tenlion.twoduty.pojo.bos.indexauditlog;
* @ClassName: IndexAuditLogBO
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @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 indexAuditId;
private String indexAuditContent;
private String indexAuditStates;
private String creator;
private String gmtModified;
private String modifier;
private Integer isDelete;
public String getIndexAuditLogId() {
@ -31,44 +26,28 @@ public class IndexAuditLogBO {
this.indexAuditLogId = indexAuditLogId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexAuditStatus() {
return indexAuditStatus == null ? "" : indexAuditStatus.trim();
public String getIndexAuditContent() {
return indexAuditContent == null ? "" : indexAuditContent.trim();
}
public void setIndexAuditStatus(String indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
public void setIndexAuditContent(String indexAuditContent) {
this.indexAuditContent = indexAuditContent;
}
public String getIndexAuditResult() {
return indexAuditResult == null ? "" : indexAuditResult.trim();
public String getIndexAuditStates() {
return indexAuditStates == null ? "" : indexAuditStates.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 void setIndexAuditStates(String indexAuditStates) {
this.indexAuditStates = indexAuditStates;
}
public String getCreator() {
@ -87,14 +66,6 @@ public class IndexAuditLogBO {
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;
}
@ -103,11 +74,5 @@ public class IndexAuditLogBO {
this.isDelete = isDelete;
}
public String getIndexLibId() {
return indexLibId;
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
}

79
src/main/java/com/tenlion/twoduty/pojo/dtos/indexaudit/IndexAuditDTO.java Normal file
View File

@ -0,0 +1,79 @@
package com.tenlion.twoduty.pojo.dtos.indexaudit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
*
* @ClassName: IndexAuditDTO
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
@ApiModel
public class IndexAuditDTO {
@ApiModelProperty(name = "indexAuditId", value = "主键")
private String indexAuditId;
@ApiModelProperty(name = "indexLibId", value = "指标ID")
private String indexLibId;
@ApiModelProperty(name = "indexBId", value = "指标业务ID")
private String indexBId;
@ApiModelProperty(name = "indexBTitle", value = "上报标题")
private String indexBTitle;
@ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过")
private Integer indexAuditStatus;
@ApiModelProperty(name = "indexAuditUserId", value = "审核人ID")
private String indexAuditUserId;
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexLibId() {
return indexLibId == null ? "" : indexLibId.trim();
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
}
public String getIndexBTitle() {
return indexBTitle == null ? "" : indexBTitle.trim();
}
public void setIndexBTitle(String indexBTitle) {
this.indexBTitle = indexBTitle;
}
public Integer getIndexAuditStatus() {
return indexAuditStatus == null ? 0 : indexAuditStatus;
}
public void setIndexAuditStatus(Integer indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
}
public String getIndexAuditUserId() {
return indexAuditUserId == null ? "" : indexAuditUserId.trim();
}
public void setIndexAuditUserId(String indexAuditUserId) {
this.indexAuditUserId = indexAuditUserId;
}
}

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

@ -8,24 +8,24 @@ import io.swagger.annotations.ApiModelProperty;
* @ClassName: IndexAuditLogDTO
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @Version: 3.0
**/
@ApiModel
public class IndexAuditLogDTO {
@ApiModelProperty(name = "indexAuditLogId", value = "主键")
@ApiModelProperty(name = "indexAuditLogId", value = "审核日志ID")
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;
@ApiModelProperty(name = "indexAuditId", value = "审核ID")
private String indexAuditId;
@ApiModelProperty(name = "indexAuditContent", value = "审核内容")
private String indexAuditContent;
@ApiModelProperty(name = "indexAuditStates", value = "日志状态")
private String indexAuditStates;
@ApiModelProperty(name = "creator", value = "创建人")
private String creator;
@ApiModelProperty(name = "gmtModified", value = "创建时间")
private String gmtModified;
public String getIndexAuditLogId() {
return indexAuditLogId == null ? "" : indexAuditLogId.trim();
@ -35,43 +35,45 @@ public class IndexAuditLogDTO {
this.indexAuditLogId = indexAuditLogId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexAuditStatus() {
return indexAuditStatus == null ? "" : indexAuditStatus.trim();
public String getIndexAuditContent() {
return indexAuditContent == null ? "" : indexAuditContent.trim();
}
public void setIndexAuditStatus(String indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
public void setIndexAuditContent(String indexAuditContent) {
this.indexAuditContent = indexAuditContent;
}
public String getIndexAuditResult() {
return indexAuditResult == null ? "" : indexAuditResult.trim();
public String getIndexAuditStates() {
return indexAuditStates == null ? "" : indexAuditStates.trim();
}
public void setIndexAuditResult(String indexAuditResult) {
this.indexAuditResult = indexAuditResult;
public void setIndexAuditStates(String indexAuditStates) {
this.indexAuditStates = indexAuditStates;
}
public String getIndexAuditUserId() {
return indexAuditUserId == null ? "" : indexAuditUserId.trim();
public String getCreator() {
return creator == null ? "" : creator.trim();
}
public void setIndexAuditUserId(String indexAuditUserId) {
this.indexAuditUserId = indexAuditUserId;
public void setCreator(String creator) {
this.creator = creator;
}
public String getIndexLibId() {
return indexLibId;
public String getGmtModified() {
return gmtModified == null ? "" : gmtModified.trim();
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
public void setGmtModified(String gmtModified) {
this.gmtModified = gmtModified;
}
}

114
src/main/java/com/tenlion/twoduty/pojo/pos/indexaudit/IndexAuditPO.java Normal file
View File

@ -0,0 +1,114 @@
package com.tenlion.twoduty.pojo.pos.indexaudit;
/**
*
* @ClassName: IndexAuditPO
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
public class IndexAuditPO {
private String indexAuditId;
private String indexLibId;
private String indexBId;
private String indexBTitle;
private Integer indexAuditStatus;
private String indexAuditUserId;
private String creator;
private String gmtCreate;
private String modifier;
private String gmtModified;
private Integer isDelete;
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexLibId() {
return indexLibId == null ? "" : indexLibId.trim();
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
}
public String getIndexBTitle() {
return indexBTitle == null ? "" : indexBTitle.trim();
}
public void setIndexBTitle(String indexBTitle) {
this.indexBTitle = indexBTitle;
}
public Integer getIndexAuditStatus() {
return indexAuditStatus == null ? 0 : indexAuditStatus;
}
public void setIndexAuditStatus(Integer indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
}
public String getIndexAuditUserId() {
return indexAuditUserId == null ? "" : indexAuditUserId.trim();
}
public void setIndexAuditUserId(String indexAuditUserId) {
this.indexAuditUserId = indexAuditUserId;
}
public String getCreator() {
return creator == null ? "" : creator.trim();
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getGmtCreate() {
return gmtCreate == null ? "" : gmtCreate.trim();
}
public void setGmtCreate(String gmtCreate) {
this.gmtCreate = gmtCreate;
}
public String getModifier() {
return modifier == null ? "" : modifier.trim();
}
public void setModifier(String modifier) {
this.modifier = modifier;
}
public String getGmtModified() {
return gmtModified == null ? "" : gmtModified.trim();
}
public void setGmtModified(String gmtModified) {
this.gmtModified = gmtModified;
}
public Integer getIsDelete() {
return isDelete == null ? 0 : isDelete;
}
public void setIsDelete(Integer isDelete) {
this.isDelete = isDelete;
}
}

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

@ -5,21 +5,17 @@ package com.tenlion.twoduty.pojo.pos.indexauditlog;
* @ClassName: IndexAuditLogPO
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @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 indexAuditId;
private String indexAuditContent;
private String indexAuditStates;
private String creator;
private String gmtModified;
private String modifier;
private Integer isDelete;
public String getIndexAuditLogId() {
@ -30,44 +26,28 @@ public class IndexAuditLogPO {
this.indexAuditLogId = indexAuditLogId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexAuditStatus() {
return indexAuditStatus == null ? "" : indexAuditStatus.trim();
public String getIndexAuditContent() {
return indexAuditContent == null ? "" : indexAuditContent.trim();
}
public void setIndexAuditStatus(String indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
public void setIndexAuditContent(String indexAuditContent) {
this.indexAuditContent = indexAuditContent;
}
public String getIndexAuditResult() {
return indexAuditResult == null ? "" : indexAuditResult.trim();
public String getIndexAuditStates() {
return indexAuditStates == null ? "" : indexAuditStates.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 void setIndexAuditStates(String indexAuditStates) {
this.indexAuditStates = indexAuditStates;
}
public String getCreator() {
@ -86,14 +66,6 @@ public class IndexAuditLogPO {
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;
}
@ -103,11 +75,4 @@ public class IndexAuditLogPO {
}
public String getIndexLibId() {
return indexLibId;
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
}

72
src/main/java/com/tenlion/twoduty/pojo/vos/indexaudit/IndexAuditVO.java Normal file
View File

@ -0,0 +1,72 @@
package com.tenlion.twoduty.pojo.vos.indexaudit;
import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
*
* @ClassName: IndexAuditVO
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
@ApiModel
public class IndexAuditVO {
@ApiModelProperty(name = "indexLibId", value = "指标ID")
private String indexLibId;
@ApiModelProperty(name = "indexBId", value = "指标业务ID")
private String indexBId;
@ApiModelProperty(name = "indexBTitle", value = "上报标题")
private String indexBTitle;
@ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过")
@CheckNumberAnnotation(name = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过")
private Integer indexAuditStatus;
@ApiModelProperty(name = "indexAuditUserId", value = "审核人ID")
private String indexAuditUserId;
public String getIndexLibId() {
return indexLibId == null ? "" : indexLibId.trim();
}
public void setIndexLibId(String indexLibId) {
this.indexLibId = indexLibId;
}
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
}
public String getIndexBTitle() {
return indexBTitle == null ? "" : indexBTitle.trim();
}
public void setIndexBTitle(String indexBTitle) {
this.indexBTitle = indexBTitle;
}
public Integer getIndexAuditStatus() {
return indexAuditStatus == null ? 0 : indexAuditStatus;
}
public void setIndexAuditStatus(Integer indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
}
public String getIndexAuditUserId() {
return indexAuditUserId == null ? "" : indexAuditUserId.trim();
}
public void setIndexAuditUserId(String indexAuditUserId) {
this.indexAuditUserId = indexAuditUserId;
}
}

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

@ -10,60 +10,42 @@ import io.swagger.annotations.ApiModelProperty;
* @ClassName: IndexAuditLogVO
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @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;
@ApiModelProperty(name = "indexAuditId", value = "审核ID")
private String indexAuditId;
@ApiModelProperty(name = "indexAuditContent", value = "审核内容")
private String indexAuditContent;
@ApiModelProperty(name = "indexAuditStates", value = "日志状态")
private String indexAuditStates;
public String getIndexBId() {
return indexBId == null ? "" : indexBId.trim();
public String getIndexAuditId() {
return indexAuditId == null ? "" : indexAuditId.trim();
}
public void setIndexBId(String indexBId) {
this.indexBId = indexBId;
public void setIndexAuditId(String indexAuditId) {
this.indexAuditId = indexAuditId;
}
public String getIndexAuditStatus() {
return indexAuditStatus == null ? "" : indexAuditStatus.trim();
public String getIndexAuditContent() {
return indexAuditContent == null ? "" : indexAuditContent.trim();
}
public void setIndexAuditStatus(String indexAuditStatus) {
this.indexAuditStatus = indexAuditStatus;
public void setIndexAuditContent(String indexAuditContent) {
this.indexAuditContent = indexAuditContent;
}
public String getIndexAuditResult() {
return indexAuditResult == null ? "" : indexAuditResult.trim();
public String getIndexAuditStates() {
return indexAuditStates == null ? "" : indexAuditStates.trim();
}
public void setIndexAuditResult(String indexAuditResult) {
this.indexAuditResult = indexAuditResult;
public void setIndexAuditStates(String indexAuditStates) {
this.indexAuditStates = indexAuditStates;
}
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;
}
}

188
src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java Normal file
View File

@ -0,0 +1,188 @@
package com.tenlion.twoduty.service.indexaudit;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResultList;
import com.tenlion.twoduty.pojo.dtos.indexaudit.IndexAuditDTO;
import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
import com.tenlion.twoduty.pojo.bos.indexaudit.IndexAuditBO;
import com.tenlion.twoduty.pojo.pos.indexaudit.IndexAuditPO;
import java.util.List;
import java.util.Map;
/**
* @ClassName: IIndexAuditService
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
public interface IIndexAuditService {
/**
* 新增指标审核表
*
* @param indexAuditVO
* @return
*/
void save(IndexAuditVO indexAuditVO);
/**
* 新增指标审核表
*
* @param token
* @param indexAuditVO
* @return
*/
void save(String token, IndexAuditVO indexAuditVO);
/**
* 新增指标审核表
*
* @param indexAuditVO
* @return indexAuditId
*/
String saveReturnId(IndexAuditVO indexAuditVO);
/**
* 新增指标审核表
*
* @param token
* @param indexAuditVO
* @return indexAuditId
*/
String saveReturnId(String token, IndexAuditVO indexAuditVO);
/**
* 删除指标审核表
*
* @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 indexAuditId
* @param indexAuditVO
* @return
*/
void update(String indexAuditId, IndexAuditVO indexAuditVO);
/**
* 修改指标审核表
*
* @param token
* @param indexAuditId
* @param indexAuditVO
* @return
*/
void update(String token, String indexAuditId, IndexAuditVO indexAuditVO);
/**
* 指标审核表详情
*
* @param params 参数Map
* @return
*/
IndexAuditDTO get(Map<String, Object> params);
/**
* 指标审核表详情
*
* @param indexAuditId
* @return
*/
IndexAuditDTO get(String indexAuditId);
/**
* 指标审核表详情
*
* @param params 参数Map
* @return
*/
IndexAuditBO getBO(Map<String, Object> params);
/**
* 指标审核表详情
*
* @param indexAuditId
* @return
*/
IndexAuditBO getBO(String indexAuditId);
/**
* 指标审核表详情
*
* @param params 参数Map
* @return
*/
IndexAuditPO getPO(Map<String, Object> params);
/**
* 指标审核表详情
*
* @param indexAuditId
* @return
*/
IndexAuditPO getPO(String indexAuditId);
/**
* 指标审核表列表
*
* @param params
* @return
*/
List<IndexAuditDTO> list(Map<String, Object> params);
/**
* 指标审核表列表
*
* @param params
* @return
*/
List<IndexAuditBO> listBO(Map<String, Object> params);
/**
* 指标审核表列表
*
* @param params
* @return
*/
List<IndexAuditPO> listPO(Map<String, Object> params);
/**
* 指标审核表分页列表
*
* @param page
* @return
*/
SuccessResultList<List<IndexAuditDTO>> listPage(ListPage page);
/**
* 指标审核表统计
*
* @param params
* @return
*/
Integer count(Map<String, Object> params);
}

190
src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java Normal file
View File

@ -0,0 +1,190 @@
package com.tenlion.twoduty.service.indexaudit.impl;
import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
import ink.wgink.common.base.DefaultBaseService;
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.indexaudit.IIndexAuditDao;
import com.tenlion.twoduty.pojo.dtos.indexaudit.IndexAuditDTO;
import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
import com.tenlion.twoduty.pojo.bos.indexaudit.IndexAuditBO;
import com.tenlion.twoduty.pojo.pos.indexaudit.IndexAuditPO;
import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
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: IndexAuditServiceImpl
* @Description: 指标审核表
* @Author: CodeFactory
* @Date: 2021-06-16 17:31:45
* @Version: 3.0
**/
@Service
public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexAuditService {
@Autowired
private IIndexAuditDao indexAuditDao;
@Autowired
private IIndexAuditLogService iIndexAuditLogService;
@Override
public void save(IndexAuditVO indexAuditVO) {
saveReturnId(indexAuditVO);
}
@Override
public void save(String token, IndexAuditVO indexAuditVO) {
saveReturnId(token, indexAuditVO);
}
@Override
public String saveReturnId(IndexAuditVO indexAuditVO) {
return saveReturnId(null, indexAuditVO);
}
@Override
public String saveReturnId(String token, IndexAuditVO indexAuditVO) {
String indexAuditId = UUIDUtil.getUUID();
Map<String, Object> params = HashMapUtil.beanToMap(indexAuditVO);
params.put("indexAuditId", indexAuditId);
if (StringUtils.isBlank(token)) {
setSaveInfo(params);
} else {
setAppSaveInfo(token, params);
}
indexAuditDao.save(params);
//新增上报日志
IndexAuditLogVO indexAuditLogVO = new IndexAuditLogVO();
indexAuditLogVO.setIndexAuditStates("0");
indexAuditLogVO.setIndexAuditContent("上报指标");
iIndexAuditLogService.save(indexAuditLogVO);
return indexAuditId;
}
@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("indexAuditIds", ids);
if (StringUtils.isBlank(token)) {
setUpdateInfo(params);
} else {
setAppUpdateInfo(token, params);
}
indexAuditDao.remove(params);
}
@Override
public void delete(List<String> ids) {
Map<String, Object> params = getHashMap(2);
params.put("indexAuditIds", ids);
indexAuditDao.delete(params);
}
@Override
public void update(String indexAuditId, IndexAuditVO indexAuditVO) {
update(null, indexAuditId, indexAuditVO);
}
@Override
public void update(String token, String indexAuditId, IndexAuditVO indexAuditVO) {
Map<String, Object> params = HashMapUtil.beanToMap(indexAuditVO);
params.put("indexAuditId", indexAuditId);
if (StringUtils.isBlank(token)) {
setUpdateInfo(params);
} else {
setAppUpdateInfo(token, params);
}
indexAuditDao.update(params);
}
@Override
public IndexAuditDTO get(Map<String, Object> params) {
return indexAuditDao.get(params);
}
@Override
public IndexAuditDTO get(String indexAuditId) {
Map<String, Object> params = super.getHashMap(2);
params.put("indexAuditId", indexAuditId);
return get(params);
}
@Override
public IndexAuditBO getBO(Map<String, Object> params) {
return indexAuditDao.getBO(params);
}
@Override
public IndexAuditBO getBO(String indexAuditId) {
Map<String, Object> params = super.getHashMap(2);
params.put("indexAuditId", indexAuditId);
return getBO(params);
}
@Override
public IndexAuditPO getPO(Map<String, Object> params) {
return indexAuditDao.getPO(params);
}
@Override
public IndexAuditPO getPO(String indexAuditId) {
Map<String, Object> params = super.getHashMap(2);
params.put("indexAuditId", indexAuditId);
return getPO(params);
}
@Override
public List<IndexAuditDTO> list(Map<String, Object> params) {
return indexAuditDao.list(params);
}
@Override
public List<IndexAuditBO> listBO(Map<String, Object> params) {
return indexAuditDao.listBO(params);
}
@Override
public List<IndexAuditPO> listPO(Map<String, Object> params) {
return indexAuditDao.listPO(params);
}
@Override
public SuccessResultList<List<IndexAuditDTO>> listPage(ListPage page) {
PageHelper.startPage(page.getPage(), page.getRows());
List<IndexAuditDTO> indexAuditDTOs = list(page.getParams());
PageInfo<IndexAuditDTO> pageInfo = new PageInfo<>(indexAuditDTOs);
return new SuccessResultList<>(indexAuditDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
}
@Override
public Integer count(Map<String, Object> params) {
Integer count = indexAuditDao.count(params);
return count == null ? 0 : count;
}
}

2
src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java
View File

@ -14,7 +14,7 @@ import java.util.Map;
* @ClassName: IIndexAuditLogService
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @Version: 3.0
**/
public interface IIndexAuditLogService {

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

@ -1,11 +1,6 @@
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;
@ -29,7 +24,7 @@ import java.util.*;
* @ClassName: IndexAuditLogServiceImpl
* @Description: 指标审核日志表
* @Author: CodeFactory
* @Date: 2021-04-23 11:05:28
* @Date: 2021-06-16 17:32:40
* @Version: 3.0
**/
@Service
@ -37,25 +32,6 @@ public class IndexAuditLogServiceImpl extends DefaultBaseService implements IInd
@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) {
@ -69,8 +45,6 @@ public class IndexAuditLogServiceImpl extends DefaultBaseService implements IInd
@Override
public String saveReturnId(IndexAuditLogVO indexAuditLogVO) {
indexAuditLogVO.setIndexAuditStatus("0");
indexAuditLogVO.setIndexAuditUserId("1");
return saveReturnId(null, indexAuditLogVO);
}
@ -119,7 +93,6 @@ public class IndexAuditLogServiceImpl extends DefaultBaseService implements IInd
@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)) {
@ -128,21 +101,6 @@ public class IndexAuditLogServiceImpl extends DefaultBaseService implements IInd
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

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

@ -66,11 +66,6 @@ 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;
}
@ -114,10 +109,6 @@ 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

2
src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java
View File

@ -9,7 +9,7 @@ package com.tenlion.twoduty.utils;
*/
public enum AuditStatusEnum {
WAIT("1"), PASS("2"), UN_PASS("-1"), FILE("2"), NORMAL("0");
NORMAL("0"),WAIT("1"), PASS("2"), UN_PASS("-1"),;
private final String auditStatus;

2
src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml
View File

@ -269,6 +269,8 @@
<if test="creator != '1'.toString()">
AND t1.creator = #{creator}
</if>
ORDER BY t1.gmt_create DESC
</select>

329
src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml Normal file
View File

@ -0,0 +1,329 @@
<?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.indexaudit.IIndexAuditDao">
<resultMap id="indexAuditDTO" type="com.tenlion.twoduty.pojo.dtos.indexaudit.IndexAuditDTO">
<result column="index_audit_id" property="indexAuditId"/>
<result column="index_lib_id" property="indexLibId"/>
<result column="index_b_id" property="indexBId"/>
<result column="index_b_title" property="indexBTitle"/>
<result column="index_audit_status" property="indexAuditStatus"/>
<result column="index_audit_user_id" property="indexAuditUserId"/>
</resultMap>
<resultMap id="indexAuditBO" type="com.tenlion.twoduty.pojo.bos.indexaudit.IndexAuditBO">
<result column="index_audit_id" property="indexAuditId"/>
<result column="index_lib_id" property="indexLibId"/>
<result column="index_b_id" property="indexBId"/>
<result column="index_b_title" property="indexBTitle"/>
<result column="index_audit_status" property="indexAuditStatus"/>
<result column="index_audit_user_id" property="indexAuditUserId"/>
<result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/>
<result column="gmt_modified" property="gmtModified"/>
<result column="is_delete" property="isDelete"/>
</resultMap>
<resultMap id="indexAuditPO" type="com.tenlion.twoduty.pojo.pos.indexaudit.IndexAuditPO">
<result column="index_audit_id" property="indexAuditId"/>
<result column="index_lib_id" property="indexLibId"/>
<result column="index_b_id" property="indexBId"/>
<result column="index_b_title" property="indexBTitle"/>
<result column="index_audit_status" property="indexAuditStatus"/>
<result column="index_audit_user_id" property="indexAuditUserId"/>
<result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/>
<result column="gmt_modified" property="gmtModified"/>
<result column="is_delete" property="isDelete"/>
</resultMap>
<!-- 新增指标审核表 -->
<insert id="save" parameterType="map">
INSERT INTO duty_index_audit(
index_audit_id,
index_lib_id,
index_b_id,
index_b_title,
index_audit_status,
index_audit_user_id,
creator,
gmt_create,
modifier,
gmt_modified,
is_delete
) VALUES(
#{indexAuditId},
#{indexLibId},
#{indexBId},
#{indexBTitle},
#{indexAuditStatus},
#{indexAuditUserId},
#{creator},
#{gmtCreate},
#{modifier},
#{gmtModified},
#{isDelete}
)
</insert>
<!-- 删除指标审核表 -->
<update id="remove" parameterType="map">
UPDATE
duty_index_audit
SET
gmt_modified = #{gmtModified},
modifier = #{modifier},
is_delete = 1
WHERE
index_audit_id IN
<foreach collection="indexAuditIds" index="index" open="(" separator="," close=")">
#{indexAuditIds[${index}]}
</foreach>
</update>
<!-- 删除指标审核表（物理） -->
<update id="delete" parameterType="map">
DELETE FROM
duty_index_audit
WHERE
index_audit_id IN
<foreach collection="indexAuditIds" index="index" open="(" separator="," close=")">
#{indexAuditIds[${index}]}
</foreach>
</update>
<!-- 修改指标审核表 -->
<update id="update" parameterType="map">
UPDATE
duty_index_audit
SET
<if test="indexLibId != null and indexLibId != ''">
index_lib_id = #{indexLibId},
</if>
<if test="indexBId != null and indexBId != ''">
index_b_id = #{indexBId},
</if>
<if test="indexBTitle != null and indexBTitle != ''">
index_b_title = #{indexBTitle},
</if>
<if test="indexAuditStatus != null">
index_audit_status = #{indexAuditStatus},
</if>
<if test="indexAuditUserId != null and indexAuditUserId != ''">
index_audit_user_id = #{indexAuditUserId},
</if>
gmt_modified = #{gmtModified},
modifier = #{modifier},
index_audit_id = index_audit_id
WHERE
index_audit_id = #{indexAuditId}
</update>
<!-- 指标审核表详情 -->
<select id="get" parameterType="map" resultMap="indexAuditDTO">
SELECT
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id,
t1.index_audit_id
FROM
duty_index_audit t1
WHERE
t1.is_delete = 0
<if test="indexAuditId != null and indexAuditId != ''">
AND
t1.index_audit_id = #{indexAuditId}
</if>
</select>
<!-- 指标审核表详情 -->
<select id="getBO" parameterType="map" resultMap="indexAuditBO">
SELECT
t1.index_audit_id,
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
FROM
duty_index_audit t1
WHERE
t1.is_delete = 0
<if test="indexAuditId != null and indexAuditId != ''">
AND
t1.index_audit_id = #{indexAuditId}
</if>
</select>
<!-- 指标审核表详情 -->
<select id="getPO" parameterType="map" resultMap="indexAuditPO">
SELECT
t1.index_audit_id,
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
FROM
duty_index_audit t1
WHERE
t1.is_delete = 0
<if test="indexAuditId != null and indexAuditId != ''">
AND
t1.index_audit_id = #{indexAuditId}
</if>
</select>
<!-- 指标审核表列表 -->
<select id="list" parameterType="map" resultMap="indexAuditDTO">
SELECT
t1.index_audit_id,
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id
FROM
duty_index_audit t1
WHERE
t1.is_delete = 0
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.index_b_title 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="indexAuditStatus != null and indexAuditStatus != ''">
AND t1.index_audit_status = #{indexAuditStatus}
</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="indexAuditIds != null and indexAuditIds.size > 0">
AND
t1.index_audit_id IN
<foreach collection="indexAuditIds" index="index" open="(" separator="," close=")">
#{indexAuditIds[${index}]}
</foreach>
</if>
</select>
<!-- 指标审核表列表 -->
<select id="listBO" parameterType="map" resultMap="indexAuditBO">
SELECT
t1.index_audit_id,
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
FROM
duty_index_audit 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="indexAuditIds != null and indexAuditIds.size > 0">
AND
t1.index_audit_id IN
<foreach collection="indexAuditIds" index="index" open="(" separator="," close=")">
#{indexAuditIds[${index}]}
</foreach>
</if>
</select>
<!-- 指标审核表列表 -->
<select id="listPO" parameterType="map" resultMap="indexAuditPO">
SELECT
t1.index_audit_id,
t1.index_lib_id,
t1.index_b_id,
t1.index_b_title,
t1.index_audit_status,
t1.index_audit_user_id,
t1.creator,
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
FROM
duty_index_audit 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="indexAuditIds != null and indexAuditIds.size > 0">
AND
t1.index_audit_id IN
<foreach collection="indexAuditIds" index="index" open="(" separator="," close=")">
#{indexAuditIds[${index}]}
</foreach>
</if>
</select>
<!-- 指标审核表统计 -->
<select id="count" parameterType="map" resultType="Integer">
SELECT
COUNT(*)
FROM
duty_index_audit t1
WHERE
t1.is_delete = 0
</select>
</mapper>

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

@ -4,38 +4,30 @@
<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"/>
<result column="index_audit_id" property="indexAuditId"/>
<result column="index_audit_content" property="indexAuditContent"/>
<result column="index_audit_states" property="indexAuditStates"/>
<result column="creator" property="creator"/>
<result column="gmt_modified" property="gmtModified"/>
</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="index_audit_id" property="indexAuditId"/>
<result column="index_audit_content" property="indexAuditContent"/>
<result column="index_audit_states" property="indexAuditStates"/>
<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="index_audit_id" property="indexAuditId"/>
<result column="index_audit_content" property="indexAuditContent"/>
<result column="index_audit_states" property="indexAuditStates"/>
<result column="creator" property="creator"/>
<result column="gmt_modified" property="gmtModified"/>
<result column="modifier" property="modifier"/>
<result column="is_delete" property="isDelete"/>
</resultMap>
@ -43,27 +35,19 @@
<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,
index_audit_id,
index_audit_content,
index_audit_states,
creator,
gmt_modified,
modifier,
is_delete
) VALUES(
#{indexAuditLogId},
#{indexBId},
#{indexLibId},
#{indexAuditStatus},
#{indexAuditResult},
#{indexAuditUserId},
#{gmtCreate},
#{indexAuditId},
#{indexAuditContent},
#{indexAuditStates},
#{creator},
#{gmtModified},
#{modifier},
#{isDelete}
)
</insert>
@ -74,7 +58,6 @@
duty_index_audit_log
SET
gmt_modified = #{gmtModified},
modifier = #{modifier},
is_delete = 1
WHERE
index_audit_log_id IN
@ -99,14 +82,17 @@
UPDATE
duty_index_audit_log
SET
<if test="indexAuditStatus != null and indexAuditStatus != ''">
index_audit_status = #{indexAuditStatus},
<if test="indexAuditId != null and indexAuditId != ''">
index_audit_id = #{indexAuditId},
</if>
<if test="indexAuditResult != null and indexAuditResult != ''">
index_audit_result = #{indexAuditResult},
<if test="indexAuditContent != null and indexAuditContent != ''">
index_audit_content = #{indexAuditContent},
</if>
<if test="indexAuditStates != null and indexAuditStates != ''">
index_audit_states = #{indexAuditStates},
</if>
gmt_modified = #{gmtModified},
modifier = #{modifier}
index_audit_log_id = index_audit_log_id
WHERE
index_audit_log_id = #{indexAuditLogId}
</update>
@ -114,11 +100,9 @@
<!-- 指标审核日志表详情 -->
<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_id,
t1.index_audit_content,
t1.index_audit_states,
t1.index_audit_log_id
FROM
duty_index_audit_log t1
@ -134,15 +118,11 @@
<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.index_audit_id,
t1.index_audit_content,
t1.index_audit_states,
t1.creator,
t1.gmt_modified,
t1.modifier,
t1.is_delete
FROM
duty_index_audit_log t1
@ -158,15 +138,11 @@
<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.index_audit_id,
t1.index_audit_content,
t1.index_audit_states,
t1.creator,
t1.gmt_modified,
t1.modifier,
t1.is_delete
FROM
duty_index_audit_log t1
@ -182,11 +158,12 @@
<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
t1.index_audit_id,
t1.index_audit_content,
t1.index_audit_states,
t1.creator,
t1.gmt_modified,
1
FROM
duty_index_audit_log t1
WHERE
@ -197,40 +174,24 @@
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
<if test="indexAuditLogIds != null and indexAuditLogIds.size > 0">
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}]}
t1.index_audit_log_id IN
<foreach collection="indexAuditLogIds" index="index" open="(" separator="," close=")">
#{indexAuditLogIds[${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.index_audit_id,
t1.index_audit_content,
t1.index_audit_states,
t1.creator,
t1.gmt_modified,
t1.modifier,
t1.is_delete
FROM
duty_index_audit_log t1
@ -242,14 +203,6 @@
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
@ -263,15 +216,11 @@
<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.index_audit_id,
t1.index_audit_content,
t1.index_audit_states,
t1.creator,
t1.gmt_modified,
t1.modifier,
t1.is_delete
FROM
duty_index_audit_log t1
@ -283,14 +232,6 @@
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
@ -310,24 +251,4 @@
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>

13
src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml
View File

@ -220,11 +220,14 @@
t1.audit_status,
t1.gmt_create,
t1.creator,
t2.index_lib_name duty_index_lib_name
t2.index_lib_name duty_index_lib_name,
su.user_name AS creator_name
FROM
duty_index_general t1
LEFT JOIN duty_index_lib t2
ON t1.duty_index_lib_id = t2.index_lib_id
LEFT JOIN sys_user su
ON t1.creator = su.user_id
WHERE
t1.is_delete = 0
<if test="keywords != null and keywords != ''">
@ -240,11 +243,11 @@
AND
LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
</if>
<if test="indexGeneralIds != null and indexGeneralIds.size > 0">
<if test="data_creators != null and data_creators.size > 0">
AND
t1.index_general_id IN
<foreach collection="indexGeneralIds" index="index" open="(" separator="," close=")">
#{indexGeneralIds[${index}]}
t1.creator IN
<foreach collection="data_creators" index="index" open="(" separator="," close=")">
#{data_creators[${index}]}
</foreach>
</if>
<if test="indexLibId != null and indexLibId != ''">

BIN
src/main/resources/static/assets/web/images/banner4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 666 KiB

BIN
src/main/resources/static/assets/web/images/banner5.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 660 KiB

294
src/main/resources/static/route/indexaudit/list.html Normal file
View File

@ -0,0 +1,294 @@
<!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/indexaudit/listpage';
var departmentId = top.restAjax.params(window.location.href).departmentId;
if(departmentId){
}
var indexLibIdParentId = top.restAjax.params(window.location.href).indexLibIdParentId;
var indexAuditStatus = top.restAjax.params(window.location.href).indexAuditStatus;
// 初始化表格
function initTable() {
table.render({
elem: '#dataTable',
id: 'dataTable',
url: top.restAjax.path(tableUrl, []),
where:{
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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: 'indexAuditId', width: 180, title: '主键', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'indexLibId', 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: '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: 'indexBTitle', 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: '审核状态：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: '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(),
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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/indexaudit/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/indexaudit/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/indexaudit/update.html?indexAuditId={indexAuditId}', [checkDatas[0].indexAuditId]),
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['indexAuditId'];
}
removeData(ids);
}
}
});
});
</script>
</body>
</html>

153
src/main/resources/static/route/indexauditlog/list-audit.html → src/main/resources/static/route/indexaudit/list_1.html
View File

@ -31,6 +31,20 @@
</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>
@ -51,8 +65,18 @@
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;
var tableUrl = 'api/indexaudit/listpage';
var indexAuditStatus = '0';
var departmentId = top.restAjax.params(window.location.href).departmentId;
if(departmentId){
}
var indexLibIdParentId = top.restAjax.params(window.location.href).indexLibIdParentId;
@ -61,7 +85,12 @@
table.render({
elem: '#dataTable',
id: 'dataTable',
url: top.restAjax.path(tableUrl, [indexLibId]),
url: top.restAjax.path(tableUrl, []),
where:{
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
width: admin.screen() > 1 ? '100%' : '',
height: $win.height() - 90,
limit: 20,
@ -75,7 +104,7 @@
[
{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',
{field: 'indexAuditId', width: 180, title: '主键', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -84,7 +113,7 @@
return rowData;
}
},
{field: 'indexLibName', width: 180, title: '审核人', align:'center',
{field: 'indexLibId', width: 180, title: '指标ID', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -93,28 +122,7 @@
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',
{field: 'indexBId', width: 180, title: '指标业务ID', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -123,22 +131,33 @@
return rowData;
}
},
{field: 'cz', width: 180, title: '操作', align:'center',fixed: 'right',
{field: 'indexBTitle', width: 180, title: '上报标题', align:'center',
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>';
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
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;
}
}
},
{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: '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,
@ -155,11 +174,14 @@
// 重载表格
function reloadTable(currentPage) {
table.reload('dataTable', {
url: top.restAjax.path(tableUrl, [indexLibId]),
url: top.restAjax.path(tableUrl, []),
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
page: {
curr: currentPage
@ -188,7 +210,7 @@
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.restAjax.delete(top.restAjax.path('api/indexaudit/remove/{ids}', [ids]), {}, null, function (code, data) {
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
reloadTable();
}, function (code, data) {
@ -214,11 +236,12 @@
$(document).on('click', '#search', function() {
reloadTable(1);
});
table.on('tool(dataTable)', function(obj) {
// 事件 - 增删改
table.on('toolbar(dataTable)', function(obj) {
var layEvent = obj.event;
var data = obj.data;
if(layEvent === 'audit') {
var checkStatus = table.checkStatus('dataTable');
var checkDatas = checkStatus.data;
if(layEvent === 'saveEvent') {
layer.open({
type: 2,
title: false,
@ -226,17 +249,45 @@
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]),
content: top.restAjax.path('route/indexaudit/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/indexaudit/update.html?indexAuditId={indexAuditId}', [checkDatas[0].indexAuditId]),
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['indexAuditId'];
}
removeData(ids);
}
}
});
});
</script>
</body>

295
src/main/resources/static/route/indexaudit/list_2.html Normal file
View File

@ -0,0 +1,295 @@
<!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/indexaudit/listpage';
var indexAuditStatus = '1';
var departmentId = top.restAjax.params(window.location.href).departmentId;
if(departmentId){
}
var indexLibIdParentId = top.restAjax.params(window.location.href).indexLibIdParentId;
var indexAuditStatus = top.restAjax.params(window.location.href).indexAuditStatus;
// 初始化表格
function initTable() {
table.render({
elem: '#dataTable',
id: 'dataTable',
url: top.restAjax.path(tableUrl, []),
where:{
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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: 'indexAuditId', width: 180, title: '主键', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'indexLibId', 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: '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: 'indexBTitle', 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: '审核状态：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: '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(),
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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/indexaudit/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/indexaudit/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/indexaudit/update.html?indexAuditId={indexAuditId}', [checkDatas[0].indexAuditId]),
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['indexAuditId'];
}
removeData(ids);
}
}
});
});
</script>
</body>
</html>

295
src/main/resources/static/route/indexaudit/list_3.html Normal file
View File

@ -0,0 +1,295 @@
<!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/indexaudit/listpage';
var indexAuditStatus = '2';
var departmentId = top.restAjax.params(window.location.href).departmentId;
if(departmentId){
}
var indexLibIdParentId = top.restAjax.params(window.location.href).indexLibIdParentId;
var indexAuditStatus = top.restAjax.params(window.location.href).indexAuditStatus;
// 初始化表格
function initTable() {
table.render({
elem: '#dataTable',
id: 'dataTable',
url: top.restAjax.path(tableUrl, []),
where:{
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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: 'indexAuditId', width: 180, title: '主键', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'indexLibId', 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: '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: 'indexBTitle', 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: '审核状态：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: '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(),
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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/indexaudit/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/indexaudit/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/indexaudit/update.html?indexAuditId={indexAuditId}', [checkDatas[0].indexAuditId]),
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['indexAuditId'];
}
removeData(ids);
}
}
});
});
</script>
</body>
</html>

295
src/main/resources/static/route/indexaudit/list_4.html Normal file
View File

@ -0,0 +1,295 @@
<!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/indexaudit/listpage';
var indexAuditStatus = '-1';
var departmentId = top.restAjax.params(window.location.href).departmentId;
if(departmentId){
}
var indexLibIdParentId = top.restAjax.params(window.location.href).indexLibIdParentId;
var indexAuditStatus = top.restAjax.params(window.location.href).indexAuditStatus;
// 初始化表格
function initTable() {
table.render({
elem: '#dataTable',
id: 'dataTable',
url: top.restAjax.path(tableUrl, []),
where:{
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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: 'indexAuditId', width: 180, title: '主键', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'indexLibId', 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: '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: 'indexBTitle', 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: '审核状态：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: '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(),
departmentId:departmentId,
indexLibIdParentId:indexLibIdParentId,
indexAuditStatus:indexAuditStatus
},
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/indexaudit/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/indexaudit/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/indexaudit/update.html?indexAuditId={indexAuditId}', [checkDatas[0].indexAuditId]),
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['indexAuditId'];
}
removeData(ids);
}
}
});
});
</script>
</body>
</html>

184
src/main/resources/static/route/indexaudit/save.html Normal file
View File

@ -0,0 +1,184 @@
<!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="indexLibId" name="indexLibId" class="layui-input" value="" placeholder="请输入指标ID" maxlength="36">
</div>
</div>
<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">上报标题</label>
<div class="layui-input-block">
<input type="text" id="indexBTitle" name="indexBTitle" class="layui-input" value="" placeholder="请输入上报标题" maxlength="500">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审核状态：0 待审核 1审核通过 2已归档 -1审核不通过</label>
<div class="layui-input-block">
<input type="number" id="indexAuditStatus" name="indexAuditStatus" class="layui-input" value="" placeholder="请输入审核状态：0 待审核 1审核通过 2已归档 -1审核不通过" lay-verify="required">
</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 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() {
}
initData();
// 提交表单
form.on('submit(submitForm)', function(formData) {
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
var loadLayerIndex;
top.restAjax.post(top.restAjax.path('api/indexaudit/save', []), 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>

201
src/main/resources/static/route/indexaudit/update.html Normal file
View File

@ -0,0 +1,201 @@
<!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="indexLibId" name="indexLibId" class="layui-input" value="" placeholder="请输入指标ID" maxlength="36">
</div>
</div>
<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">上报标题</label>
<div class="layui-input-block">
<input type="text" id="indexBTitle" name="indexBTitle" class="layui-input" value="" placeholder="请输入上报标题" maxlength="500">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审核状态：0 待审核 1审核通过 2已归档 -1审核不通过</label>
<div class="layui-input-block">
<input type="number" id="indexAuditStatus" name="indexAuditStatus" class="layui-input" value="" placeholder="请输入审核状态：0 待审核 1审核通过 2已归档 -1审核不通过" lay-verify="required">
</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 indexAuditId = top.restAjax.params(window.location.href).indexAuditId;
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/indexaudit/get/{indexAuditId}', [indexAuditId]), {}, 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/indexaudit/update/{indexAuditId}', [indexAuditId]), 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>

24
src/main/resources/static/route/indexauditlog/list.html
View File

@ -65,10 +65,7 @@
var laydate = layui.laydate;
var common = layui.common;
var resizeTimeout = null;
var tableUrl = 'api/indexauditlog/listpage/{indexLibId}';
var tableUrl = 'api/indexauditlog/listpage';
// 初始化表格
function initTable() {
@ -89,7 +86,7 @@
[
{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',
{field: 'indexAuditLogId', width: 180, title: '审核日志ID', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -98,7 +95,7 @@
return rowData;
}
},
{field: 'indexBId', width: 180, title: '指标业务ID', align:'center',
{field: 'indexAuditId', width: 180, title: '审核ID', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -107,7 +104,7 @@
return rowData;
}
},
{field: 'indexAuditStatus', width: 180, title: '审核状态：0 待审核 1审核通过 2已归档 -1审核不通过', align:'center',
{field: 'indexAuditContent', width: 180, title: '审核内容', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -116,7 +113,7 @@
return rowData;
}
},
{field: 'indexAuditResult', width: 180, title: '审核内容', align:'center',
{field: 'indexAuditStates', width: 180, title: '日志状态', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -125,7 +122,16 @@
return rowData;
}
},
{field: 'indexAuditUserId', width: 180, title: '审核人ID', align:'center',
{field: 'creator', width: 180, title: '创建人', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'gmtModified', width: 180, title: '创建时间', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {

91
src/main/resources/static/route/indexauditlog/save.html
View File

@ -22,23 +22,28 @@
</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">
<div class="layui-form-item">
<label class="layui-form-label">审核ID</label>
<div class="layui-input-block">
<input type="text" id="indexAuditId" name="indexAuditId" class="layui-input" value="" placeholder="请输入审核ID" maxlength="36">
</div>
</div>
<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>
<textarea id="indexAuditContent" name="indexAuditContent" class="layui-textarea" placeholder="请输入审核内容"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">日志状态</label>
<div class="layui-input-block">
<input type="text" id="indexAuditStates" name="indexAuditStates" class="layui-input" value="" placeholder="请输入日志状态" maxlength="20">
</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" lay-submit lay-filter="submitForm">提交新增</button>
<button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
</div>
</div>
@ -64,37 +69,73 @@
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 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() {
loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
}, function() {
top.dialog.close(loadLayerIndex);
});
}
// 初始化视频
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() {
}
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) {
top.restAjax.post(top.restAjax.path('api/indexauditlog/save', []), 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],

18
src/main/resources/static/route/indexauditlog/update.html
View File

@ -23,27 +23,21 @@
<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>
<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">
<input type="text" id="indexAuditId" name="indexAuditId" 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">
<div class="layui-form-item layui-form-text">
<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">
<textarea id="indexAuditContent" name="indexAuditContent" class="layui-textarea" placeholder="请输入审核内容"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审核人ID</label>
<label class="layui-form-label">日志状态</label>
<div class="layui-input-block">
<input type="text" id="indexAuditUserId" name="indexAuditUserId" class="layui-input" value="" placeholder="请输入审核人ID" maxlength="36">
<input type="text" id="indexAuditStates" name="indexAuditStates" class="layui-input" value="" placeholder="请输入日志状态" maxlength="20">
</div>
</div>
<div class="layui-form-item layui-layout-admin">

8
src/main/resources/static/route/indexgeneral/list.html
View File

@ -144,7 +144,7 @@
return downloadFile;
}
},
{field: 'creatorName', width: 100, title: '上报人', align:'center',
{field: 'creatorName', width: 100, title: '上报人', align:'center',fixed: 'right',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -153,7 +153,7 @@
return rowData;
}
},
{field: 'gmtCreate', width: 200, title: '上报时间', align:'center',
{field: 'gmtCreate', width: 200, title: '上报时间', align:'center',fixed: 'right',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -186,9 +186,9 @@
var rowData = '<div class="layui-btn-group">';
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="show">查看</button>';
if (auditStatus === -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="update">重新上报</button>';
}
// rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>'
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>'
rowData +='</div>';
return rowData;
}

7
src/main/resources/static/route/web/public.html
View File

@ -212,9 +212,10 @@
<span>操作：</span>
<a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateSavePath, list.indexLibId)">上报</a>
<a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateListPath, list.indexLibId)">查看列表</a>
<!-- <a href="javascript: void(0);" class="operation-btn operation-pass">已通过(0)</a>-->
<!-- <a href="javascript: void(0);" class="operation-btn operation-not-pass">未通过(0)</a>-->
<!-- <a href="javascript: void(0);" class="operation-btn operation-score">得分</a>-->
<!--<a href="javascript: void(0);" class="operation-btn operation-pass">审核通过(0)</a>-->
<!--<a href="javascript: void(0);" class="operation-btn operation-not-pass">待审核(0)</a>-->
<!--<a href="javascript: void(0);" class="operation-btn operation-score">归档</a>-->
<!--<a href="javascript: void(0);" class="operation-btn operation-score">不通过</a>-->
</div>
</li>
</ul>

10
src/main/resources/templates/count_role_1.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

10
src/main/resources/templates/count_role_2.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

2
src/main/resources/templates/index.html
View File

@ -11,7 +11,7 @@
<div id="app">
<div class="header">
<div class="banner">
<img src="assets/web/images/banner3.png" alt="">
<img src="assets/web/images/banner5.png" alt="">
</div>
<div class="nav">
<ul class="clearFloat" v-cloak>