diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexaudit/IndexAuditController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexaudit/IndexAuditController.java new file mode 100644 index 0000000..94ca7a5 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/controller/api/indexaudit/IndexAuditController.java @@ -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 list() { + Map 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> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return indexAuditService.listPage(page); + } + + @ApiOperation(value = "指标审核表统计", notes = "指标审核表统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(indexAuditService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java index 392273b..9a1f750 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java @@ -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> listAuditPage(ListPage page,@PathVariable("indexLibId") String indexLibId) { - Map params = requestParams(); - params.put("indexAuditUserId",securityComponent.getCurrentUser().getUserId()); - List 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)}) diff --git a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java index d804167..1cbb10d 100644 --- a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java +++ b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java @@ -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 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 initWebButton(UserInfoBO currentUser){ + List list = new ArrayList<>(); + List 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; + } + } diff --git a/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java b/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java new file mode 100644 index 0000000..9bbb17a --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java @@ -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 params) throws SaveException; + + /** + * 删除指标审核表 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 删除指标审核表（物理） + * + * @param params + * @throws RemoveException + */ + void delete(Map params) throws RemoveException; + + /** + * 修改指标审核表 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 指标审核表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditDTO get(Map params) throws SearchException; + + /** + * 指标审核表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditBO getBO(Map params) throws SearchException; + + /** + * 指标审核表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditPO getPO(Map params) throws SearchException; + + /** + * 指标审核表列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 指标审核表列表 + * + * @param params + * @return + * @throws SearchException + */ + List listBO(Map params) throws SearchException; + + /** + * 指标审核表列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + + /** + * 指标审核表统计 + * + * @param params + * @return + * @throws SearchException + */ + Integer count(Map params) throws SearchException; + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java b/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java index 6a8c6c3..b677612 100644 --- a/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java +++ b/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java @@ -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 params) throws UpdateException; /** * 新增指标审核日志表 * diff --git a/src/main/java/com/tenlion/twoduty/pojo/bos/indexaudit/IndexAuditBO.java b/src/main/java/com/tenlion/twoduty/pojo/bos/indexaudit/IndexAuditBO.java new file mode 100644 index 0000000..0d5a784 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/bos/indexaudit/IndexAuditBO.java @@ -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; + } + + +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java b/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java index 3a20bb3..57428f9 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java @@ -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; - } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexaudit/IndexAuditDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexaudit/IndexAuditDTO.java new file mode 100644 index 0000000..d8f7fac --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexaudit/IndexAuditDTO.java @@ -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; + } + + +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java index 4d599b3..7edf511 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java @@ -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; } + + } diff --git a/src/main/java/com/tenlion/twoduty/pojo/pos/indexaudit/IndexAuditPO.java b/src/main/java/com/tenlion/twoduty/pojo/pos/indexaudit/IndexAuditPO.java new file mode 100644 index 0000000..55ff298 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/pos/indexaudit/IndexAuditPO.java @@ -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; + } + + +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java b/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java index c5fcbce..4a20f61 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java @@ -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; - } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/vos/indexaudit/IndexAuditVO.java b/src/main/java/com/tenlion/twoduty/pojo/vos/indexaudit/IndexAuditVO.java new file mode 100644 index 0000000..9af358f --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indexaudit/IndexAuditVO.java @@ -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; + } + + +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java b/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java index 2b6d58a..7e80c6d 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java @@ -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; - } } diff --git a/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java b/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java new file mode 100644 index 0000000..a98c44d --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java @@ -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 ids); + + + /** + * 删除指标审核表 + * + * @param token + * @param ids id列表 + * @return + */ + void remove(String token, List ids); + + /** + * 删除指标审核表（物理删除） + * + * @param ids id列表 + */ + void delete(List 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 params); + + /** + * 指标审核表详情 + * + * @param indexAuditId + * @return + */ + IndexAuditDTO get(String indexAuditId); + + /** + * 指标审核表详情 + * + * @param params 参数Map + * @return + */ + IndexAuditBO getBO(Map params); + + /** + * 指标审核表详情 + * + * @param indexAuditId + * @return + */ + IndexAuditBO getBO(String indexAuditId); + + /** + * 指标审核表详情 + * + * @param params 参数Map + * @return + */ + IndexAuditPO getPO(Map params); + + /** + * 指标审核表详情 + * + * @param indexAuditId + * @return + */ + IndexAuditPO getPO(String indexAuditId); + + /** + * 指标审核表列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 指标审核表列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 指标审核表列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 指标审核表分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 指标审核表统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java new file mode 100644 index 0000000..a514cfd --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java @@ -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 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 ids) { + remove(null, ids); + } + + @Override + public void remove(String token, List ids) { + Map 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 ids) { + Map 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 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 params) { + return indexAuditDao.get(params); + } + + @Override + public IndexAuditDTO get(String indexAuditId) { + Map params = super.getHashMap(2); + params.put("indexAuditId", indexAuditId); + return get(params); + } + + @Override + public IndexAuditBO getBO(Map params) { + return indexAuditDao.getBO(params); + } + + @Override + public IndexAuditBO getBO(String indexAuditId) { + Map params = super.getHashMap(2); + params.put("indexAuditId", indexAuditId); + return getBO(params); + } + + @Override + public IndexAuditPO getPO(Map params) { + return indexAuditDao.getPO(params); + } + + @Override + public IndexAuditPO getPO(String indexAuditId) { + Map params = super.getHashMap(2); + params.put("indexAuditId", indexAuditId); + return getPO(params); + } + + @Override + public List list(Map params) { + return indexAuditDao.list(params); + } + + @Override + public List listBO(Map params) { + return indexAuditDao.listBO(params); + } + + @Override + public List listPO(Map params) { + return indexAuditDao.listPO(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List indexAuditDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(indexAuditDTOs); + return new SuccessResultList<>(indexAuditDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public Integer count(Map params) { + Integer count = indexAuditDao.count(params); + return count == null ? 0 : count; + } + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java b/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java index d6c51ed..68cf720 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java +++ b/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java @@ -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 { diff --git a/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java index 60e03e3..07e9342 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java @@ -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> listAuditPage(ListPage page) { - PageHelper.startPage(page.getPage(), page.getRows()); - List indexAuditLogDTOs = list(page.getParams()); - PageInfo 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 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 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 diff --git a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java index acffb77..737d69e 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java @@ -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 diff --git a/src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java b/src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java index b83fa15..89338b6 100644 --- a/src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java +++ b/src/main/java/com/tenlion/twoduty/utils/AuditStatusEnum.java @@ -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; diff --git a/src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml b/src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml index 646f1a8..95a586d 100644 --- a/src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml +++ b/src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml @@ -269,6 +269,8 @@ AND t1.creator = #{creator} + + ORDER BY t1.gmt_create DESC diff --git a/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml b/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml new file mode 100644 index 0000000..6e3875a --- /dev/null +++ b/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + ) + + + + + UPDATE + duty_index_audit + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + index_audit_id IN + + #{indexAuditIds[${index}]} + + + + + + DELETE FROM + duty_index_audit + WHERE + index_audit_id IN + + #{indexAuditIds[${index}]} + + + + + + UPDATE + duty_index_audit + SET + + index_lib_id = #{indexLibId}, + + + index_b_id = #{indexBId}, + + + index_b_title = #{indexBTitle}, + + + index_audit_status = #{indexAuditStatus}, + + + index_audit_user_id = #{indexAuditUserId}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + index_audit_id = index_audit_id + WHERE + index_audit_id = #{indexAuditId} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml b/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml index 7a8cf34..b23c441 100644 --- a/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml @@ -4,38 +4,30 @@ - - - - - + + + + + - - - - - - + + + - - - - - - - + + + - @@ -43,27 +35,19 @@ 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} ) @@ -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 - - index_audit_status = #{indexAuditStatus}, + + index_audit_id = #{indexAuditId}, - - index_audit_result = #{indexAuditResult}, + + index_audit_content = #{indexAuditContent}, + + + index_audit_states = #{indexAuditStates}, gmt_modified = #{gmtModified}, - modifier = #{modifier} + index_audit_log_id = index_audit_log_id WHERE index_audit_log_id = #{indexAuditLogId} @@ -114,11 +100,9 @@ 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 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}, '%') ) - + AND - LEFT(t1.gmt_create, 10) = ]]> #{startTime} - - - AND - LEFT(t1.gmt_create, 10) #{endTime} - - - AND - t1.index_lib_id IN - - #{indexLibIds[${index}]} + t1.index_audit_log_id IN + + #{indexAuditLogIds[${index}]} - - AND t1.index_audit_user_id = #{indexAuditUserId} - - ORDER BY t1.gmt_create DESC 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}, '%') ) - - AND - LEFT(t1.gmt_create, 10) = ]]> #{startTime} - - - AND - LEFT(t1.gmt_create, 10) #{endTime} - AND t1.index_audit_log_id IN @@ -310,24 +251,4 @@ t1.is_delete = 0 - - - - - - UPDATE - #{tableName} - SET - audit_status = #{auditStatus} - WHERE - is_delete = 0 - - AND report_id = #{indexBId} - - - AND index_general_id = #{indexBId} - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml b/src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml index 3c67dff..4aac152 100644 --- a/src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml @@ -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 @@ -240,11 +243,11 @@ AND LEFT(t1.gmt_create, 10) #{endTime} - + AND - t1.index_general_id IN - - #{indexGeneralIds[${index}]} + t1.creator IN + + #{data_creators[${index}]} diff --git a/src/main/resources/static/assets/web/images/banner4.png b/src/main/resources/static/assets/web/images/banner4.png new file mode 100644 index 0000000..0df4a92 Binary files /dev/null and b/src/main/resources/static/assets/web/images/banner4.png differ diff --git a/src/main/resources/static/assets/web/images/banner5.jpg b/src/main/resources/static/assets/web/images/banner5.jpg new file mode 100644 index 0000000..3852b44 Binary files /dev/null and b/src/main/resources/static/assets/web/images/banner5.jpg differ diff --git a/src/main/resources/static/route/indexaudit/list.html b/src/main/resources/static/route/indexaudit/list.html new file mode 100644 index 0000000..e0e52e2 --- /dev/null +++ b/src/main/resources/static/route/indexaudit/list.html @@ -0,0 +1,294 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexauditlog/list-audit.html b/src/main/resources/static/route/indexaudit/list_1.html similarity index 63% rename from src/main/resources/static/route/indexauditlog/list-audit.html rename to src/main/resources/static/route/indexaudit/list_1.html index 9c6cdb2..72f32ce 100644 --- a/src/main/resources/static/route/indexauditlog/list-audit.html +++ b/src/main/resources/static/route/indexaudit/list_1.html @@ -31,6 +31,20 @@
+ + @@ -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: '{{d.LAY_INDEX}}'}, - {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 = '
'; - rowData +=''; - if (indexAuditStatus == -1) { - rowData +=''; + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; } - rowData +=''; - if (indexAuditStatus == 0) { - rowData +=''; - } - rowData +='
'; 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); + } } }); - - - }); diff --git a/src/main/resources/static/route/indexaudit/list_2.html b/src/main/resources/static/route/indexaudit/list_2.html new file mode 100644 index 0000000..c521064 --- /dev/null +++ b/src/main/resources/static/route/indexaudit/list_2.html @@ -0,0 +1,295 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexaudit/list_3.html b/src/main/resources/static/route/indexaudit/list_3.html new file mode 100644 index 0000000..8df121d --- /dev/null +++ b/src/main/resources/static/route/indexaudit/list_3.html @@ -0,0 +1,295 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexaudit/list_4.html b/src/main/resources/static/route/indexaudit/list_4.html new file mode 100644 index 0000000..3491e09 --- /dev/null +++ b/src/main/resources/static/route/indexaudit/list_4.html @@ -0,0 +1,295 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexaudit/save.html b/src/main/resources/static/route/indexaudit/save.html new file mode 100644 index 0000000..5fefef8 --- /dev/null +++ b/src/main/resources/static/route/indexaudit/save.html @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexaudit/update.html b/src/main/resources/static/route/indexaudit/update.html new file mode 100644 index 0000000..67d5e18 --- /dev/null +++ b/src/main/resources/static/route/indexaudit/update.html @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexauditlog/list.html b/src/main/resources/static/route/indexauditlog/list.html index 895727a..ac8ab2f 100644 --- a/src/main/resources/static/route/indexauditlog/list.html +++ b/src/main/resources/static/route/indexauditlog/list.html @@ -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: '{{d.LAY_INDEX}}'}, - {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 == '') { diff --git a/src/main/resources/static/route/indexauditlog/save.html b/src/main/resources/static/route/indexauditlog/save.html index 2c8bd0e..2e35a36 100644 --- a/src/main/resources/static/route/indexauditlog/save.html +++ b/src/main/resources/static/route/indexauditlog/save.html @@ -22,23 +22,28 @@
- - -
+
+ +
+ +
+
+
- + +
+
+
+ +
+
- - - +
@@ -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], diff --git a/src/main/resources/static/route/indexauditlog/update.html b/src/main/resources/static/route/indexauditlog/update.html index 81591af..a8cd81a 100644 --- a/src/main/resources/static/route/indexauditlog/update.html +++ b/src/main/resources/static/route/indexauditlog/update.html @@ -23,27 +23,21 @@
- +
- +
-
- -
- -
-
-
+
- +
- +
- +
diff --git a/src/main/resources/static/route/indexgeneral/list.html b/src/main/resources/static/route/indexgeneral/list.html index 90b1663..affcd3c 100644 --- a/src/main/resources/static/route/indexgeneral/list.html +++ b/src/main/resources/static/route/indexgeneral/list.html @@ -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 = '
'; rowData +=''; if (auditStatus === -1) { - rowData +=''; + rowData +=''; } - // rowData +='' + rowData +='' rowData +='
'; return rowData; } diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index a6905d7..dec6396 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -212,9 +212,10 @@ 操作： 上报 查看列表 - - - + + + +
diff --git a/src/main/resources/templates/count_role_1.html b/src/main/resources/templates/count_role_1.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/count_role_1.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/count_role_2.html b/src/main/resources/templates/count_role_2.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/count_role_2.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 837637e..1915aa9 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -11,7 +11,7 @@