Commit ae103c5f29cee61dd36b924320edc19b2f968aac
1 parent
c0517e7e
11
Showing
182 changed files
with
9196 additions
and
770 deletions
trash-activiti/src/main/java/com/trash/activiti/mapper/ActWorkflowFormDataMapper.java
| @@ -23,14 +23,14 @@ public interface ActWorkflowFormDataMapper | @@ -23,14 +23,14 @@ public interface ActWorkflowFormDataMapper | ||
| 23 | * @param id 动态单ID | 23 | * @param id 动态单ID |
| 24 | * @return 动态单 | 24 | * @return 动态单 |
| 25 | */ | 25 | */ |
| 26 | - public ActWorkflowFormData selectActWorkflowFormDataById(Long id); | 26 | + ActWorkflowFormData selectActWorkflowFormDataById(Long id); |
| 27 | /** | 27 | /** |
| 28 | * 查询动态单 | 28 | * 查询动态单 |
| 29 | * | 29 | * |
| 30 | * @param businessKey 动态单ID | 30 | * @param businessKey 动态单ID |
| 31 | * @return 动态单 | 31 | * @return 动态单 |
| 32 | */ | 32 | */ |
| 33 | - public List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey); | 33 | + List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey); |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * 查询动态单列表 | 36 | * 查询动态单列表 |
| @@ -38,7 +38,7 @@ public interface ActWorkflowFormDataMapper | @@ -38,7 +38,7 @@ public interface ActWorkflowFormDataMapper | ||
| 38 | * @param ActWorkflowFormData 动态单 | 38 | * @param ActWorkflowFormData 动态单 |
| 39 | * @return 动态单集合 | 39 | * @return 动态单集合 |
| 40 | */ | 40 | */ |
| 41 | - public List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData); | 41 | + List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData); |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * 新增动态单 | 44 | * 新增动态单 |
| @@ -46,7 +46,7 @@ public interface ActWorkflowFormDataMapper | @@ -46,7 +46,7 @@ public interface ActWorkflowFormDataMapper | ||
| 46 | * @param ActWorkflowFormData 动态单 | 46 | * @param ActWorkflowFormData 动态单 |
| 47 | * @return 结果 | 47 | * @return 结果 |
| 48 | */ | 48 | */ |
| 49 | - public int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); | 49 | + int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | /** | 52 | /** |
| @@ -55,7 +55,7 @@ public interface ActWorkflowFormDataMapper | @@ -55,7 +55,7 @@ public interface ActWorkflowFormDataMapper | ||
| 55 | * @param | 55 | * @param |
| 56 | * @return 结果 | 56 | * @return 结果 |
| 57 | */ | 57 | */ |
| 58 | - public int insertActWorkflowFormDatas(@Param("createBy") String createBy, @Param("ActWorkflowFormData")List<ActWorkflowFormData> ActWorkflowFormData, Date date ,String createName); | 58 | + int insertActWorkflowFormDatas(@Param("createBy") String createBy, @Param("ActWorkflowFormData") List<ActWorkflowFormData> ActWorkflowFormData, Date date, String createName); |
| 59 | 59 | ||
| 60 | 60 | ||
| 61 | 61 | ||
| @@ -66,7 +66,7 @@ public interface ActWorkflowFormDataMapper | @@ -66,7 +66,7 @@ public interface ActWorkflowFormDataMapper | ||
| 66 | * @param ActWorkflowFormData 动态单 | 66 | * @param ActWorkflowFormData 动态单 |
| 67 | * @return 结果 | 67 | * @return 结果 |
| 68 | */ | 68 | */ |
| 69 | - public int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); | 69 | + int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); |
| 70 | 70 | ||
| 71 | /** | 71 | /** |
| 72 | * 删除动态单 | 72 | * 删除动态单 |
| @@ -74,7 +74,7 @@ public interface ActWorkflowFormDataMapper | @@ -74,7 +74,7 @@ public interface ActWorkflowFormDataMapper | ||
| 74 | * @param id 动态单ID | 74 | * @param id 动态单ID |
| 75 | * @return 结果 | 75 | * @return 结果 |
| 76 | */ | 76 | */ |
| 77 | - public int deleteActWorkflowFormDataById(Long id); | 77 | + int deleteActWorkflowFormDataById(Long id); |
| 78 | 78 | ||
| 79 | /** | 79 | /** |
| 80 | * 批量删除动态单 | 80 | * 批量删除动态单 |
| @@ -82,5 +82,5 @@ public interface ActWorkflowFormDataMapper | @@ -82,5 +82,5 @@ public interface ActWorkflowFormDataMapper | ||
| 82 | * @param ids 需要删除的数据ID | 82 | * @param ids 需要删除的数据ID |
| 83 | * @return 结果 | 83 | * @return 结果 |
| 84 | */ | 84 | */ |
| 85 | - public int deleteActWorkflowFormDataByIds(Long[] ids); | 85 | + int deleteActWorkflowFormDataByIds(Long[] ids); |
| 86 | } | 86 | } |
trash-activiti/src/main/java/com/trash/activiti/service/IActTaskService.java
| @@ -9,9 +9,9 @@ import java.text.ParseException; | @@ -9,9 +9,9 @@ import java.text.ParseException; | ||
| 9 | import java.util.List; | 9 | import java.util.List; |
| 10 | 10 | ||
| 11 | public interface IActTaskService { | 11 | public interface IActTaskService { |
| 12 | - public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain); | ||
| 13 | - public List<String>formDataShow(String taskID); | ||
| 14 | - public int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException; | 12 | + Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain); |
| 13 | + List<String>formDataShow(String taskID); | ||
| 14 | + int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException; | ||
| 15 | 15 | ||
| 16 | Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain); | 16 | Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain); |
| 17 | 17 |
trash-activiti/src/main/java/com/trash/activiti/service/IActWorkflowFormDataService.java
| @@ -18,9 +18,9 @@ public interface IActWorkflowFormDataService | @@ -18,9 +18,9 @@ public interface IActWorkflowFormDataService | ||
| 18 | * @param id 动态单ID | 18 | * @param id 动态单ID |
| 19 | * @return 动态单 | 19 | * @return 动态单 |
| 20 | */ | 20 | */ |
| 21 | - public ActWorkflowFormData selectActWorkflowFormDataById(Long id); | 21 | + ActWorkflowFormData selectActWorkflowFormDataById(Long id); |
| 22 | 22 | ||
| 23 | - public List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey); | 23 | + List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey); |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * 查询动态单列表 | 26 | * 查询动态单列表 |
| @@ -28,7 +28,7 @@ public interface IActWorkflowFormDataService | @@ -28,7 +28,7 @@ public interface IActWorkflowFormDataService | ||
| 28 | * @param ActWorkflowFormData 动态单 | 28 | * @param ActWorkflowFormData 动态单 |
| 29 | * @return 动态单集合 | 29 | * @return 动态单集合 |
| 30 | */ | 30 | */ |
| 31 | - public List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData); | 31 | + List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData); |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 新增动态单 | 34 | * 新增动态单 |
| @@ -36,14 +36,14 @@ public interface IActWorkflowFormDataService | @@ -36,14 +36,14 @@ public interface IActWorkflowFormDataService | ||
| 36 | * @param ActWorkflowFormData 动态单 | 36 | * @param ActWorkflowFormData 动态单 |
| 37 | * @return 结果 | 37 | * @return 结果 |
| 38 | */ | 38 | */ |
| 39 | - public int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); | 39 | + int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 新增动态单集合 | 42 | * 新增动态单集合 |
| 43 | * @param ActWorkflowFormDatas 动态表单集合 | 43 | * @param ActWorkflowFormDatas 动态表单集合 |
| 44 | * @return | 44 | * @return |
| 45 | */ | 45 | */ |
| 46 | - public int insertActWorkflowFormDatas(List<ActWorkflowFormData> ActWorkflowFormDatas); | 46 | + int insertActWorkflowFormDatas(List<ActWorkflowFormData> ActWorkflowFormDatas); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 修改动态单 | 49 | * 修改动态单 |
| @@ -51,7 +51,7 @@ public interface IActWorkflowFormDataService | @@ -51,7 +51,7 @@ public interface IActWorkflowFormDataService | ||
| 51 | * @param ActWorkflowFormData 动态单 | 51 | * @param ActWorkflowFormData 动态单 |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); | 54 | + int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 批量删除动态单 | 57 | * 批量删除动态单 |
| @@ -59,7 +59,7 @@ public interface IActWorkflowFormDataService | @@ -59,7 +59,7 @@ public interface IActWorkflowFormDataService | ||
| 59 | * @param ids 需要删除的动态单ID | 59 | * @param ids 需要删除的动态单ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteActWorkflowFormDataByIds(Long[] ids); | 62 | + int deleteActWorkflowFormDataByIds(Long[] ids); |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * 删除动态单信息 | 65 | * 删除动态单信息 |
| @@ -67,5 +67,5 @@ public interface IActWorkflowFormDataService | @@ -67,5 +67,5 @@ public interface IActWorkflowFormDataService | ||
| 67 | * @param id 动态单ID | 67 | * @param id 动态单ID |
| 68 | * @return 结果 | 68 | * @return 结果 |
| 69 | */ | 69 | */ |
| 70 | - public int deleteActWorkflowFormDataById(Long id); | 70 | + int deleteActWorkflowFormDataById(Long id); |
| 71 | } | 71 | } |
trash-activiti/src/main/java/com/trash/activiti/service/IActivitiHistoryService.java
| @@ -3,5 +3,5 @@ package com.trash.activiti.service; | @@ -3,5 +3,5 @@ package com.trash.activiti.service; | ||
| 3 | import com.trash.activiti.domain.dto.ActivitiHighLineDTO; | 3 | import com.trash.activiti.domain.dto.ActivitiHighLineDTO; |
| 4 | 4 | ||
| 5 | public interface IActivitiHistoryService { | 5 | public interface IActivitiHistoryService { |
| 6 | - public ActivitiHighLineDTO gethighLine(String instanceId); | 6 | + ActivitiHighLineDTO gethighLine(String instanceId); |
| 7 | } | 7 | } |
trash-activiti/src/main/java/com/trash/activiti/service/IFormHistoryDataService.java
| @@ -12,5 +12,5 @@ import com.trash.activiti.domain.dto.HistoryDataDTO; | @@ -12,5 +12,5 @@ import com.trash.activiti.domain.dto.HistoryDataDTO; | ||
| 12 | */ | 12 | */ |
| 13 | public interface IFormHistoryDataService { | 13 | public interface IFormHistoryDataService { |
| 14 | 14 | ||
| 15 | - public List<HistoryDataDTO> historyDataShow(String instanceId); | 15 | + List<HistoryDataDTO> historyDataShow(String instanceId); |
| 16 | } | 16 | } |
trash-activiti/src/main/java/com/trash/activiti/service/IProcessDefinitionService.java
| @@ -24,41 +24,41 @@ public interface IProcessDefinitionService { | @@ -24,41 +24,41 @@ public interface IProcessDefinitionService { | ||
| 24 | * @param processDefinition | 24 | * @param processDefinition |
| 25 | * @return Page 分页信息 | 25 | * @return Page 分页信息 |
| 26 | */ | 26 | */ |
| 27 | - public Page<ProcessDefinitionDTO> selectProcessDefinitionList(ProcessDefinitionDTO processDefinition, PageDomain pageDomain); | ||
| 28 | - public DefinitionIdDTO getDefinitionsByInstanceId(String instanceId); | 27 | + Page<ProcessDefinitionDTO> selectProcessDefinitionList(ProcessDefinitionDTO processDefinition, PageDomain pageDomain); |
| 28 | + DefinitionIdDTO getDefinitionsByInstanceId(String instanceId); | ||
| 29 | /** | 29 | /** |
| 30 | * 删除流程定义 | 30 | * 删除流程定义 |
| 31 | * @param id | 31 | * @param id |
| 32 | * @return | 32 | * @return |
| 33 | */ | 33 | */ |
| 34 | - public int deleteProcessDefinitionById(String id); | 34 | + int deleteProcessDefinitionById(String id); |
| 35 | /** | 35 | /** |
| 36 | * 上传并部署流程定义 | 36 | * 上传并部署流程定义 |
| 37 | * @param file | 37 | * @param file |
| 38 | * @return | 38 | * @return |
| 39 | * @throws IOException | 39 | * @throws IOException |
| 40 | */ | 40 | */ |
| 41 | - public void uploadStreamAndDeployment(MultipartFile file) throws IOException; | 41 | + void uploadStreamAndDeployment(MultipartFile file) throws IOException; |
| 42 | /** | 42 | /** |
| 43 | * 启动挂起流程流程定义 | 43 | * 启动挂起流程流程定义 |
| 44 | * @param id 流程定义id | 44 | * @param id 流程定义id |
| 45 | * @param suspendState 流程状态 | 45 | * @param suspendState 流程状态 |
| 46 | * @return | 46 | * @return |
| 47 | */ | 47 | */ |
| 48 | - public void suspendOrActiveApply(String id, Integer suspendState); | 48 | + void suspendOrActiveApply(String id, Integer suspendState); |
| 49 | 49 | ||
| 50 | /** | 50 | /** |
| 51 | * 上传流程流程定义 | 51 | * 上传流程流程定义 |
| 52 | * @param multipartFile | 52 | * @param multipartFile |
| 53 | * @return | 53 | * @return |
| 54 | */ | 54 | */ |
| 55 | - public String upload(MultipartFile multipartFile) throws IOException; | 55 | + String upload(MultipartFile multipartFile) throws IOException; |
| 56 | /** | 56 | /** |
| 57 | * 通过stringBPMN添加流程定义 | 57 | * 通过stringBPMN添加流程定义 |
| 58 | * @param stringBPMN | 58 | * @param stringBPMN |
| 59 | * @return | 59 | * @return |
| 60 | */ | 60 | */ |
| 61 | - public void addDeploymentByString(String stringBPMN ); | 61 | + void addDeploymentByString(String stringBPMN); |
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * 获取流程定义XML | 64 | * 获取流程定义XML |
| @@ -66,5 +66,5 @@ public interface IProcessDefinitionService { | @@ -66,5 +66,5 @@ public interface IProcessDefinitionService { | ||
| 66 | * @param deploymentId | 66 | * @param deploymentId |
| 67 | * @param resourceName | 67 | * @param resourceName |
| 68 | */ | 68 | */ |
| 69 | - public void getProcessDefineXML(HttpServletResponse response, String deploymentId,String resourceName) throws IOException; | 69 | + void getProcessDefineXML(HttpServletResponse response, String deploymentId, String resourceName) throws IOException; |
| 70 | } | 70 | } |
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
| @@ -67,22 +67,22 @@ public class ActTaskServiceImpl implements IActTaskService { | @@ -67,22 +67,22 @@ public class ActTaskServiceImpl implements IActTaskService { | ||
| 67 | UserGroupManager userGroupManager; | 67 | UserGroupManager userGroupManager; |
| 68 | 68 | ||
| 69 | HistoricProcessInstanceQuery processInstanceQuery; | 69 | HistoricProcessInstanceQuery processInstanceQuery; |
| 70 | - | ||
| 71 | - | 70 | + |
| 71 | + | ||
| 72 | 72 | ||
| 73 | @Override | 73 | @Override |
| 74 | public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) { | 74 | public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) { |
| 75 | Page<ActTaskDTO> list = new Page<ActTaskDTO>(); | 75 | Page<ActTaskDTO> list = new Page<ActTaskDTO>(); |
| 76 | - | ||
| 77 | - List<String> posts = new ArrayList<>(); | ||
| 78 | - posts.add("4"); | ||
| 79 | - SecurityUtils.getLoginUser().getUser().setPostIds(posts); | ||
| 80 | - List<String> roles = new ArrayList<>(); | ||
| 81 | - roles.add("7"); | ||
| 82 | - SecurityUtils.getLoginUser().getUser().setRoleIds(roles); | 76 | + |
| 77 | +// List<String> posts = new ArrayList<>(); | ||
| 78 | +// posts.add("4"); | ||
| 79 | +// SecurityUtils.getLoginUser().getUser().setPostIds(posts); | ||
| 80 | +// List<String> roles = new ArrayList<>(); | ||
| 81 | +// posts.add("7"); | ||
| 82 | +// SecurityUtils.getLoginUser().getUser().setRoleIds(roles); | ||
| 83 | 83 | ||
| 84 | org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize())); | 84 | org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize())); |
| 85 | - | 85 | + |
| 86 | List<Task> tasks = pageTasks.getContent(); | 86 | List<Task> tasks = pageTasks.getContent(); |
| 87 | int totalItems = pageTasks.getTotalItems(); | 87 | int totalItems = pageTasks.getTotalItems(); |
| 88 | list.setTotal(totalItems); | 88 | list.setTotal(totalItems); |
| @@ -247,8 +247,8 @@ public class ActTaskServiceImpl implements IActTaskService { | @@ -247,8 +247,8 @@ public class ActTaskServiceImpl implements IActTaskService { | ||
| 247 | 247 | ||
| 248 | 248 | ||
| 249 | List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户 | 249 | List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户 |
| 250 | - | ||
| 251 | - | 250 | + |
| 251 | + | ||
| 252 | 252 | ||
| 253 | // 写入数据库 | 253 | // 写入数据库 |
| 254 | return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds); | 254 | return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds); |
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
| @@ -28,7 +28,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService { | @@ -28,7 +28,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService { | ||
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | - private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 31 | + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 32 | 32 | ||
| 33 | @Override | 33 | @Override |
| 34 | public List<HistoryDataDTO> historyDataShow(String businessKey) { | 34 | public List<HistoryDataDTO> historyDataShow(String businessKey) { |
trash-admin/src/main/java/com/trash/web/controller/system/SysDeptController.java
| @@ -59,7 +59,7 @@ public class SysDeptController extends BaseController | @@ -59,7 +59,7 @@ public class SysDeptController extends BaseController | ||
| 59 | Iterator<SysDept> it = depts.iterator(); | 59 | Iterator<SysDept> it = depts.iterator(); |
| 60 | while (it.hasNext()) | 60 | while (it.hasNext()) |
| 61 | { | 61 | { |
| 62 | - SysDept d = (SysDept) it.next(); | 62 | + SysDept d = it.next(); |
| 63 | if (d.getDeptId().intValue() == deptId | 63 | if (d.getDeptId().intValue() == deptId |
| 64 | || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) | 64 | || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) |
| 65 | { | 65 | { |
trash-admin/src/main/resources/application-dev.yml
| @@ -9,8 +9,9 @@ trash: | @@ -9,8 +9,9 @@ trash: | ||
| 9 | # 实例演示开关 | 9 | # 实例演示开关 |
| 10 | demoEnabled: true | 10 | demoEnabled: true |
| 11 | # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload） | 11 | # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload） |
| 12 | - profile: E:/trash/uploadPath | ||
| 13 | - # 获取ip地址开关 | 12 | +# profile: E:/trash/uploadPath |
| 13 | + profile: D:/work/project/Documents/uploadPath/trash | ||
| 14 | +# 获取ip地址开关 | ||
| 14 | addressEnabled: false | 15 | addressEnabled: false |
| 15 | # 验证码类型 math 数组计算 char 字符验证 | 16 | # 验证码类型 math 数组计算 char 字符验证 |
| 16 | captchaType: math | 17 | captchaType: math |
| @@ -26,7 +27,8 @@ spring: | @@ -26,7 +27,8 @@ spring: | ||
| 26 | master: | 27 | master: |
| 27 | url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true | 28 | url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true |
| 28 | username: root | 29 | username: root |
| 29 | - password: root | 30 | +# password: root |
| 31 | + password: asd0731. | ||
| 30 | # 从库数据源 | 32 | # 从库数据源 |
| 31 | slave: | 33 | slave: |
| 32 | # 从数据源开关/默认关闭 | 34 | # 从数据源开关/默认关闭 |
| @@ -80,7 +82,7 @@ spring: | @@ -80,7 +82,7 @@ spring: | ||
| 80 | # 端口，默认为6379 | 82 | # 端口，默认为6379 |
| 81 | port: 6379 | 83 | port: 6379 |
| 82 | # 密码 | 84 | # 密码 |
| 83 | - password: | 85 | + password: bsth123 |
| 84 | # 连接超时时间 | 86 | # 连接超时时间 |
| 85 | timeout: 10s | 87 | timeout: 10s |
| 86 | database: 10 | 88 | database: 10 |
trash-admin/src/main/resources/logback.xml
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <configuration> | 2 | <configuration> |
| 3 | <!-- 日志存放路径 --> | 3 | <!-- 日志存放路径 --> |
| 4 | - <property name="log.path" value="/home/trash/logs" /> | 4 | +<!-- <property name="log.path" value="/home/trash/logs" />--> |
| 5 | + <property name="log.path" value="D:/work/project/logs/trash" /> | ||
| 5 | <!-- 日志输出格式 --> | 6 | <!-- 日志输出格式 --> |
| 6 | <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> | 7 | <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> |
| 7 | 8 |
trash-common/src/main/java/com/trash/common/annotation/DataScope.java
| @@ -19,10 +19,10 @@ public @interface DataScope | @@ -19,10 +19,10 @@ public @interface DataScope | ||
| 19 | /** | 19 | /** |
| 20 | * 部门表的别名 | 20 | * 部门表的别名 |
| 21 | */ | 21 | */ |
| 22 | - public String deptAlias() default ""; | 22 | + String deptAlias() default ""; |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 用户表的别名 | 25 | * 用户表的别名 |
| 26 | */ | 26 | */ |
| 27 | - public String userAlias() default ""; | 27 | + String userAlias() default ""; |
| 28 | } | 28 | } |
trash-common/src/main/java/com/trash/common/annotation/DataSource.java
trash-common/src/main/java/com/trash/common/annotation/Excel.java
| @@ -18,99 +18,99 @@ public @interface Excel | @@ -18,99 +18,99 @@ public @interface Excel | ||
| 18 | /** | 18 | /** |
| 19 | * 导出时在excel中排序 | 19 | * 导出时在excel中排序 |
| 20 | */ | 20 | */ |
| 21 | - public int sort() default Integer.MAX_VALUE; | 21 | + int sort() default Integer.MAX_VALUE; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 导出到Excel中的名字. | 24 | * 导出到Excel中的名字. |
| 25 | */ | 25 | */ |
| 26 | - public String name() default ""; | 26 | + String name() default ""; |
| 27 | 27 | ||
| 28 | /** | 28 | /** |
| 29 | * 日期格式, 如: yyyy-MM-dd | 29 | * 日期格式, 如: yyyy-MM-dd |
| 30 | */ | 30 | */ |
| 31 | - public String dateFormat() default ""; | 31 | + String dateFormat() default ""; |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) | 34 | * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) |
| 35 | */ | 35 | */ |
| 36 | - public String dictType() default ""; | 36 | + String dictType() default ""; |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 读取内容转表达式 (如: 0=男,1=女,2=未知) | 39 | * 读取内容转表达式 (如: 0=男,1=女,2=未知) |
| 40 | */ | 40 | */ |
| 41 | - public String readConverterExp() default ""; | 41 | + String readConverterExp() default ""; |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * 分隔符，读取字符串组内容 | 44 | * 分隔符，读取字符串组内容 |
| 45 | */ | 45 | */ |
| 46 | - public String separator() default ","; | 46 | + String separator() default ","; |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) | 49 | * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) |
| 50 | */ | 50 | */ |
| 51 | - public int scale() default -1; | 51 | + int scale() default -1; |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN | 54 | * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN |
| 55 | */ | 55 | */ |
| 56 | - public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; | 56 | + int roundingMode() default BigDecimal.ROUND_HALF_EVEN; |
| 57 | 57 | ||
| 58 | /** | 58 | /** |
| 59 | * 导出类型（0数字 1字符串） | 59 | * 导出类型（0数字 1字符串） |
| 60 | */ | 60 | */ |
| 61 | - public ColumnType cellType() default ColumnType.STRING; | 61 | + ColumnType cellType() default ColumnType.STRING; |
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * 导出时在excel中每个列的高度 单位为字符 | 64 | * 导出时在excel中每个列的高度 单位为字符 |
| 65 | */ | 65 | */ |
| 66 | - public double height() default 14; | 66 | + double height() default 14; |
| 67 | 67 | ||
| 68 | /** | 68 | /** |
| 69 | * 导出时在excel中每个列的宽 单位为字符 | 69 | * 导出时在excel中每个列的宽 单位为字符 |
| 70 | */ | 70 | */ |
| 71 | - public double width() default 16; | 71 | + double width() default 16; |
| 72 | 72 | ||
| 73 | /** | 73 | /** |
| 74 | * 文字后缀,如% 90 变成90% | 74 | * 文字后缀,如% 90 变成90% |
| 75 | */ | 75 | */ |
| 76 | - public String suffix() default ""; | 76 | + String suffix() default ""; |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * 当值为空时,字段的默认值 | 79 | * 当值为空时,字段的默认值 |
| 80 | */ | 80 | */ |
| 81 | - public String defaultValue() default ""; | 81 | + String defaultValue() default ""; |
| 82 | 82 | ||
| 83 | /** | 83 | /** |
| 84 | * 提示信息 | 84 | * 提示信息 |
| 85 | */ | 85 | */ |
| 86 | - public String prompt() default ""; | 86 | + String prompt() default ""; |
| 87 | 87 | ||
| 88 | /** | 88 | /** |
| 89 | * 设置只能选择不能输入的列内容. | 89 | * 设置只能选择不能输入的列内容. |
| 90 | */ | 90 | */ |
| 91 | - public String[] combo() default {}; | 91 | + String[] combo() default {}; |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. | 94 | * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. |
| 95 | */ | 95 | */ |
| 96 | - public boolean isExport() default true; | 96 | + boolean isExport() default true; |
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * 另一个类中的属性名称,支持多级获取,以小数点隔开 | 99 | * 另一个类中的属性名称,支持多级获取,以小数点隔开 |
| 100 | */ | 100 | */ |
| 101 | - public String targetAttr() default ""; | 101 | + String targetAttr() default ""; |
| 102 | 102 | ||
| 103 | /** | 103 | /** |
| 104 | * 是否自动统计数据,在最后追加一行统计数据总和 | 104 | * 是否自动统计数据,在最后追加一行统计数据总和 |
| 105 | */ | 105 | */ |
| 106 | - public boolean isStatistics() default false; | 106 | + boolean isStatistics() default false; |
| 107 | 107 | ||
| 108 | /** | 108 | /** |
| 109 | * 字段类型（0：导出导入；1：仅导出；2：仅导入） | 109 | * 字段类型（0：导出导入；1：仅导出；2：仅导入） |
| 110 | */ | 110 | */ |
| 111 | Type type() default Type.ALL; | 111 | Type type() default Type.ALL; |
| 112 | 112 | ||
| 113 | - public enum Type | 113 | + enum Type |
| 114 | { | 114 | { |
| 115 | ALL(0), EXPORT(1), IMPORT(2); | 115 | ALL(0), EXPORT(1), IMPORT(2); |
| 116 | private final int value; | 116 | private final int value; |
| @@ -126,7 +126,7 @@ public @interface Excel | @@ -126,7 +126,7 @@ public @interface Excel | ||
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | - public enum ColumnType | 129 | + enum ColumnType |
| 130 | { | 130 | { |
| 131 | NUMERIC(0), STRING(1); | 131 | NUMERIC(0), STRING(1); |
| 132 | private final int value; | 132 | private final int value; |
trash-common/src/main/java/com/trash/common/annotation/Log.java
| @@ -23,20 +23,20 @@ public @interface Log | @@ -23,20 +23,20 @@ public @interface Log | ||
| 23 | /** | 23 | /** |
| 24 | * 模块 | 24 | * 模块 |
| 25 | */ | 25 | */ |
| 26 | - public String title() default ""; | 26 | + String title() default ""; |
| 27 | 27 | ||
| 28 | /** | 28 | /** |
| 29 | * 功能 | 29 | * 功能 |
| 30 | */ | 30 | */ |
| 31 | - public BusinessType businessType() default BusinessType.OTHER; | 31 | + BusinessType businessType() default BusinessType.OTHER; |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 操作人类别 | 34 | * 操作人类别 |
| 35 | */ | 35 | */ |
| 36 | - public OperatorType operatorType() default OperatorType.MANAGE; | 36 | + OperatorType operatorType() default OperatorType.MANAGE; |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 是否保存请求的参数 | 39 | * 是否保存请求的参数 |
| 40 | */ | 40 | */ |
| 41 | - public boolean isSaveRequestData() default true; | 41 | + boolean isSaveRequestData() default true; |
| 42 | } | 42 | } |
trash-common/src/main/java/com/trash/common/config/trashConfig.java
| @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; | @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; | ||
| 6 | /** | 6 | /** |
| 7 | * 读取项目相关配置 | 7 | * 读取项目相关配置 |
| 8 | * | 8 | * |
| 9 | - * @author trash | 9 | + * @author 2c |
| 10 | */ | 10 | */ |
| 11 | @Component | 11 | @Component |
| 12 | @ConfigurationProperties(prefix = "trash") | 12 | @ConfigurationProperties(prefix = "trash") |
trash-common/src/main/java/com/trash/common/constant/ScheduleConstants.java
| @@ -35,9 +35,9 @@ public class ScheduleConstants | @@ -35,9 +35,9 @@ public class ScheduleConstants | ||
| 35 | */ | 35 | */ |
| 36 | PAUSE("1"); | 36 | PAUSE("1"); |
| 37 | 37 | ||
| 38 | - private String value; | 38 | + private final String value; |
| 39 | 39 | ||
| 40 | - private Status(String value) | 40 | + Status(String value) |
| 41 | { | 41 | { |
| 42 | this.value = value; | 42 | this.value = value; |
| 43 | } | 43 | } |
trash-common/src/main/java/com/trash/common/core/domain/entity/SysDictData.java
| @@ -132,7 +132,7 @@ public class SysDictData extends BaseEntity | @@ -132,7 +132,7 @@ public class SysDictData extends BaseEntity | ||
| 132 | 132 | ||
| 133 | public boolean getDefault() | 133 | public boolean getDefault() |
| 134 | { | 134 | { |
| 135 | - return UserConstants.YES.equals(this.isDefault) ? true : false; | 135 | + return UserConstants.YES.equals(this.isDefault); |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | public String getIsDefault() | 138 | public String getIsDefault() |
trash-common/src/main/java/com/trash/common/core/text/CharsetKit.java
| @@ -20,9 +20,9 @@ public class CharsetKit | @@ -20,9 +20,9 @@ public class CharsetKit | ||
| 20 | public static final String GBK = "GBK"; | 20 | public static final String GBK = "GBK"; |
| 21 | 21 | ||
| 22 | /** ISO-8859-1 */ | 22 | /** ISO-8859-1 */ |
| 23 | - public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1); | 23 | + public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1; |
| 24 | /** UTF-8 */ | 24 | /** UTF-8 */ |
| 25 | - public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8); | 25 | + public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8; |
| 26 | /** GBK */ | 26 | /** GBK */ |
| 27 | public static final Charset CHARSET_GBK = Charset.forName(GBK); | 27 | public static final Charset CHARSET_GBK = Charset.forName(GBK); |
| 28 | 28 |
trash-common/src/main/java/com/trash/common/core/text/Convert.java
| @@ -798,7 +798,7 @@ public class Convert | @@ -798,7 +798,7 @@ public class Convert | ||
| 798 | } | 798 | } |
| 799 | else if (obj instanceof byte[] || obj instanceof Byte[]) | 799 | else if (obj instanceof byte[] || obj instanceof Byte[]) |
| 800 | { | 800 | { |
| 801 | - return str((Byte[]) obj, charset); | 801 | + return str(obj, charset); |
| 802 | } | 802 | } |
| 803 | else if (obj instanceof ByteBuffer) | 803 | else if (obj instanceof ByteBuffer) |
| 804 | { | 804 | { |
| @@ -894,7 +894,7 @@ public class Convert | @@ -894,7 +894,7 @@ public class Convert | ||
| 894 | */ | 894 | */ |
| 895 | public static String toSBC(String input, Set<Character> notConvertSet) | 895 | public static String toSBC(String input, Set<Character> notConvertSet) |
| 896 | { | 896 | { |
| 897 | - char c[] = input.toCharArray(); | 897 | + char[] c = input.toCharArray(); |
| 898 | for (int i = 0; i < c.length; i++) | 898 | for (int i = 0; i < c.length; i++) |
| 899 | { | 899 | { |
| 900 | if (null != notConvertSet && notConvertSet.contains(c[i])) | 900 | if (null != notConvertSet && notConvertSet.contains(c[i])) |
| @@ -936,7 +936,7 @@ public class Convert | @@ -936,7 +936,7 @@ public class Convert | ||
| 936 | */ | 936 | */ |
| 937 | public static String toDBC(String text, Set<Character> notConvertSet) | 937 | public static String toDBC(String text, Set<Character> notConvertSet) |
| 938 | { | 938 | { |
| 939 | - char c[] = text.toCharArray(); | 939 | + char[] c = text.toCharArray(); |
| 940 | for (int i = 0; i < c.length; i++) | 940 | for (int i = 0; i < c.length; i++) |
| 941 | { | 941 | { |
| 942 | if (null != notConvertSet && notConvertSet.contains(c[i])) | 942 | if (null != notConvertSet && notConvertSet.contains(c[i])) |
trash-common/src/main/java/com/trash/common/exception/BaseException.java
| @@ -15,22 +15,22 @@ public class BaseException extends RuntimeException | @@ -15,22 +15,22 @@ public class BaseException extends RuntimeException | ||
| 15 | /** | 15 | /** |
| 16 | * 所属模块 | 16 | * 所属模块 |
| 17 | */ | 17 | */ |
| 18 | - private String module; | 18 | + private final String module; |
| 19 | 19 | ||
| 20 | /** | 20 | /** |
| 21 | * 错误码 | 21 | * 错误码 |
| 22 | */ | 22 | */ |
| 23 | - private String code; | 23 | + private final String code; |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * 错误码对应的参数 | 26 | * 错误码对应的参数 |
| 27 | */ | 27 | */ |
| 28 | - private Object[] args; | 28 | + private final Object[] args; |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 错误消息 | 31 | * 错误消息 |
| 32 | */ | 32 | */ |
| 33 | - private String defaultMessage; | 33 | + private final String defaultMessage; |
| 34 | 34 | ||
| 35 | public BaseException(String module, String code, Object[] args, String defaultMessage) | 35 | public BaseException(String module, String code, Object[] args, String defaultMessage) |
| 36 | { | 36 | { |
trash-common/src/main/java/com/trash/common/exception/CustomException.java
| @@ -11,7 +11,7 @@ public class CustomException extends RuntimeException | @@ -11,7 +11,7 @@ public class CustomException extends RuntimeException | ||
| 11 | 11 | ||
| 12 | private Integer code; | 12 | private Integer code; |
| 13 | 13 | ||
| 14 | - private String message; | 14 | + private final String message; |
| 15 | 15 | ||
| 16 | public CustomException(String message) | 16 | public CustomException(String message) |
| 17 | { | 17 | { |
trash-common/src/main/java/com/trash/common/exception/file/InvalidExtensionException.java
| @@ -12,9 +12,9 @@ public class InvalidExtensionException extends FileUploadException | @@ -12,9 +12,9 @@ public class InvalidExtensionException extends FileUploadException | ||
| 12 | { | 12 | { |
| 13 | private static final long serialVersionUID = 1L; | 13 | private static final long serialVersionUID = 1L; |
| 14 | 14 | ||
| 15 | - private String[] allowedExtension; | ||
| 16 | - private String extension; | ||
| 17 | - private String filename; | 15 | + private final String[] allowedExtension; |
| 16 | + private final String extension; | ||
| 17 | + private final String filename; | ||
| 18 | 18 | ||
| 19 | public InvalidExtensionException(String[] allowedExtension, String extension, String filename) | 19 | public InvalidExtensionException(String[] allowedExtension, String extension, String filename) |
| 20 | { | 20 | { |
trash-common/src/main/java/com/trash/common/exception/job/TaskException.java
| @@ -9,7 +9,7 @@ public class TaskException extends Exception | @@ -9,7 +9,7 @@ public class TaskException extends Exception | ||
| 9 | { | 9 | { |
| 10 | private static final long serialVersionUID = 1L; | 10 | private static final long serialVersionUID = 1L; |
| 11 | 11 | ||
| 12 | - private Code code; | 12 | + private final Code code; |
| 13 | 13 | ||
| 14 | public TaskException(String msg, Code code) | 14 | public TaskException(String msg, Code code) |
| 15 | { | 15 | { |
trash-common/src/main/java/com/trash/common/filter/RepeatedlyRequestWrapper.java
| @@ -4,6 +4,7 @@ import java.io.BufferedReader; | @@ -4,6 +4,7 @@ import java.io.BufferedReader; | ||
| 4 | import java.io.ByteArrayInputStream; | 4 | import java.io.ByteArrayInputStream; |
| 5 | import java.io.IOException; | 5 | import java.io.IOException; |
| 6 | import java.io.InputStreamReader; | 6 | import java.io.InputStreamReader; |
| 7 | +import java.nio.charset.StandardCharsets; | ||
| 7 | import javax.servlet.ReadListener; | 8 | import javax.servlet.ReadListener; |
| 8 | import javax.servlet.ServletInputStream; | 9 | import javax.servlet.ServletInputStream; |
| 9 | import javax.servlet.ServletResponse; | 10 | import javax.servlet.ServletResponse; |
| @@ -27,7 +28,7 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper | @@ -27,7 +28,7 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper | ||
| 27 | request.setCharacterEncoding("UTF-8"); | 28 | request.setCharacterEncoding("UTF-8"); |
| 28 | response.setCharacterEncoding("UTF-8"); | 29 | response.setCharacterEncoding("UTF-8"); |
| 29 | 30 | ||
| 30 | - body = HttpHelper.getBodyString(request).getBytes("UTF-8"); | 31 | + body = HttpHelper.getBodyString(request).getBytes(StandardCharsets.UTF_8); |
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | @Override | 34 | @Override |
trash-common/src/main/java/com/trash/common/filter/XssHttpServletRequestWrapper.java
| @@ -2,6 +2,7 @@ package com.trash.common.filter; | @@ -2,6 +2,7 @@ package com.trash.common.filter; | ||
| 2 | 2 | ||
| 3 | import java.io.ByteArrayInputStream; | 3 | import java.io.ByteArrayInputStream; |
| 4 | import java.io.IOException; | 4 | import java.io.IOException; |
| 5 | +import java.nio.charset.StandardCharsets; | ||
| 5 | import javax.servlet.ReadListener; | 6 | import javax.servlet.ReadListener; |
| 6 | import javax.servlet.ServletInputStream; | 7 | import javax.servlet.ServletInputStream; |
| 7 | import javax.servlet.http.HttpServletRequest; | 8 | import javax.servlet.http.HttpServletRequest; |
| @@ -56,7 +57,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper | @@ -56,7 +57,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper | ||
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | // 为空，直接返回 | 59 | // 为空，直接返回 |
| 59 | - String json = IOUtils.toString(super.getInputStream(), "utf-8"); | 60 | + String json = IOUtils.toString(super.getInputStream(), StandardCharsets.UTF_8); |
| 60 | if (StringUtils.isEmpty(json)) | 61 | if (StringUtils.isEmpty(json)) |
| 61 | { | 62 | { |
| 62 | return super.getInputStream(); | 63 | return super.getInputStream(); |
| @@ -64,7 +65,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper | @@ -64,7 +65,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper | ||
| 64 | 65 | ||
| 65 | // xss过滤 | 66 | // xss过滤 |
| 66 | json = EscapeUtil.clean(json).trim(); | 67 | json = EscapeUtil.clean(json).trim(); |
| 67 | - final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); | 68 | + final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); |
| 68 | return new ServletInputStream() | 69 | return new ServletInputStream() |
| 69 | { | 70 | { |
| 70 | @Override | 71 | @Override |
trash-common/src/main/java/com/trash/common/utils/DateUtils.java
| @@ -23,7 +23,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils | @@ -23,7 +23,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils | ||
| 23 | 23 | ||
| 24 | public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; | 24 | public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; |
| 25 | 25 | ||
| 26 | - private static String[] parsePatterns = { | 26 | + private static final String[] parsePatterns = { |
| 27 | "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", | 27 | "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", |
| 28 | "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", | 28 | "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", |
| 29 | "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; | 29 | "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; |
trash-common/src/main/java/com/trash/common/utils/LogUtils.java
trash-common/src/main/java/com/trash/common/utils/ServletUtils.java
| @@ -128,10 +128,6 @@ public class ServletUtils | @@ -128,10 +128,6 @@ public class ServletUtils | ||
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | String ajax = request.getParameter("__ajax"); | 130 | String ajax = request.getParameter("__ajax"); |
| 131 | - if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) | ||
| 132 | - { | ||
| 133 | - return true; | ||
| 134 | - } | ||
| 135 | - return false; | 131 | + return StringUtils.inStringIgnoreCase(ajax, "json", "xml"); |
| 136 | } | 132 | } |
| 137 | } | 133 | } |
trash-common/src/main/java/com/trash/common/utils/VerifyCodeUtils.java
| @@ -24,7 +24,7 @@ public class VerifyCodeUtils | @@ -24,7 +24,7 @@ public class VerifyCodeUtils | ||
| 24 | // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符 | 24 | // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符 |
| 25 | public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ"; | 25 | public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ"; |
| 26 | 26 | ||
| 27 | - private static Random random = new SecureRandom(); | 27 | + private static final Random random = new SecureRandom(); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 使用系统默认字符源生成验证码 | 30 | * 使用系统默认字符源生成验证码 |
trash-common/src/main/java/com/trash/common/utils/file/FileUploadUtils.java
| @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile; | @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile; | ||
| 22 | /** | 22 | /** |
| 23 | * 文件上传工具类 | 23 | * 文件上传工具类 |
| 24 | * | 24 | * |
| 25 | - * @author trash | 25 | + * @author 2c |
| 26 | */ | 26 | */ |
| 27 | public class FileUploadUtils { | 27 | public class FileUploadUtils { |
| 28 | /** | 28 | /** |
| @@ -229,11 +229,27 @@ public class FileUploadUtils { | @@ -229,11 +229,27 @@ public class FileUploadUtils { | ||
| 229 | /** | 229 | /** |
| 230 | * 文件删除 | 230 | * 文件删除 |
| 231 | * @param filePath | 231 | * @param filePath |
| 232 | + * @author 2c | ||
| 232 | */ | 233 | */ |
| 233 | public static void deleteFile(String filePath) { | 234 | public static void deleteFile(String filePath) { |
| 235 | + filePath = filePath.substring(filePath.indexOf("/profile")+8); | ||
| 234 | File file = new File(defaultBaseDir+filePath); | 236 | File file = new File(defaultBaseDir+filePath); |
| 235 | if (file.exists()) { | 237 | if (file.exists()) { |
| 236 | file.delete(); | 238 | file.delete(); |
| 237 | } | 239 | } |
| 238 | } | 240 | } |
| 241 | + | ||
| 242 | + /** | ||
| 243 | + * 文件上传 | ||
| 244 | + * @param file | ||
| 245 | + * @author 2c | ||
| 246 | + */ | ||
| 247 | + public static String uploadFile(MultipartFile file) throws IOException { | ||
| 248 | + // 上传文件路径 | ||
| 249 | + String filePath = trashConfig.getUploadPath(); | ||
| 250 | + // 上传并返回新文件名称 | ||
| 251 | + String newFileName = upload(filePath, file); | ||
| 252 | + return newFileName; | ||
| 253 | + } | ||
| 254 | + | ||
| 239 | } | 255 | } |
trash-common/src/main/java/com/trash/common/utils/html/EscapeUtil.java
trash-common/src/main/java/com/trash/common/utils/http/HttpHelper.java
| @@ -5,6 +5,7 @@ import java.io.IOException; | @@ -5,6 +5,7 @@ import java.io.IOException; | ||
| 5 | import java.io.InputStream; | 5 | import java.io.InputStream; |
| 6 | import java.io.InputStreamReader; | 6 | import java.io.InputStreamReader; |
| 7 | import java.nio.charset.Charset; | 7 | import java.nio.charset.Charset; |
| 8 | +import java.nio.charset.StandardCharsets; | ||
| 8 | import javax.servlet.ServletRequest; | 9 | import javax.servlet.ServletRequest; |
| 9 | import org.apache.commons.lang3.exception.ExceptionUtils; | 10 | import org.apache.commons.lang3.exception.ExceptionUtils; |
| 10 | import org.slf4j.Logger; | 11 | import org.slf4j.Logger; |
| @@ -25,7 +26,7 @@ public class HttpHelper | @@ -25,7 +26,7 @@ public class HttpHelper | ||
| 25 | BufferedReader reader = null; | 26 | BufferedReader reader = null; |
| 26 | try (InputStream inputStream = request.getInputStream()) | 27 | try (InputStream inputStream = request.getInputStream()) |
| 27 | { | 28 | { |
| 28 | - reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8"))); | 29 | + reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); |
| 29 | String line = ""; | 30 | String line = ""; |
| 30 | while ((line = reader.readLine()) != null) | 31 | while ((line = reader.readLine()) != null) |
| 31 | { | 32 | { |
trash-common/src/main/java/com/trash/common/utils/http/HttpUtils.java
| @@ -9,6 +9,7 @@ import java.net.ConnectException; | @@ -9,6 +9,7 @@ import java.net.ConnectException; | ||
| 9 | import java.net.SocketTimeoutException; | 9 | import java.net.SocketTimeoutException; |
| 10 | import java.net.URL; | 10 | import java.net.URL; |
| 11 | import java.net.URLConnection; | 11 | import java.net.URLConnection; |
| 12 | +import java.nio.charset.StandardCharsets; | ||
| 12 | import java.security.cert.X509Certificate; | 13 | import java.security.cert.X509Certificate; |
| 13 | import javax.net.ssl.HostnameVerifier; | 14 | import javax.net.ssl.HostnameVerifier; |
| 14 | import javax.net.ssl.HttpsURLConnection; | 15 | import javax.net.ssl.HttpsURLConnection; |
| @@ -133,7 +134,7 @@ public class HttpUtils | @@ -133,7 +134,7 @@ public class HttpUtils | ||
| 133 | out = new PrintWriter(conn.getOutputStream()); | 134 | out = new PrintWriter(conn.getOutputStream()); |
| 134 | out.print(param); | 135 | out.print(param); |
| 135 | out.flush(); | 136 | out.flush(); |
| 136 | - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); | 137 | + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); |
| 137 | String line; | 138 | String line; |
| 138 | while ((line = in.readLine()) != null) | 139 | while ((line = in.readLine()) != null) |
| 139 | { | 140 | { |
| @@ -207,7 +208,7 @@ public class HttpUtils | @@ -207,7 +208,7 @@ public class HttpUtils | ||
| 207 | { | 208 | { |
| 208 | if (ret != null && !"".equals(ret.trim())) | 209 | if (ret != null && !"".equals(ret.trim())) |
| 209 | { | 210 | { |
| 210 | - result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); | 211 | + result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); |
| 211 | } | 212 | } |
| 212 | } | 213 | } |
| 213 | log.info("recv - {}", result); | 214 | log.info("recv - {}", result); |
trash-common/src/main/java/com/trash/common/utils/poi/ExcelUtil.java
| @@ -107,7 +107,7 @@ public class ExcelUtil<T> | @@ -107,7 +107,7 @@ public class ExcelUtil<T> | ||
| 107 | /** | 107 | /** |
| 108 | * 统计列表 | 108 | * 统计列表 |
| 109 | */ | 109 | */ |
| 110 | - private Map<Integer, Double> statistics = new HashMap<Integer, Double>(); | 110 | + private final Map<Integer, Double> statistics = new HashMap<Integer, Double>(); |
| 111 | 111 | ||
| 112 | /** | 112 | /** |
| 113 | * 数字格式 | 113 | * 数字格式 |
| @@ -407,7 +407,7 @@ public class ExcelUtil<T> | @@ -407,7 +407,7 @@ public class ExcelUtil<T> | ||
| 407 | { | 407 | { |
| 408 | row = sheet.createRow(i + 1 - startNo); | 408 | row = sheet.createRow(i + 1 - startNo); |
| 409 | // 得到导出对象. | 409 | // 得到导出对象. |
| 410 | - T vo = (T) list.get(i); | 410 | + T vo = list.get(i); |
| 411 | int column = 0; | 411 | int column = 0; |
| 412 | for (Object[] os : fields) | 412 | for (Object[] os : fields) |
| 413 | { | 413 | { |
| @@ -800,7 +800,7 @@ public class ExcelUtil<T> | @@ -800,7 +800,7 @@ public class ExcelUtil<T> | ||
| 800 | */ | 800 | */ |
| 801 | public String encodingFilename(String filename) | 801 | public String encodingFilename(String filename) |
| 802 | { | 802 | { |
| 803 | - filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; | 803 | + filename = UUID.randomUUID() + "_" + filename + ".xlsx"; |
| 804 | return filename; | 804 | return filename; |
| 805 | } | 805 | } |
| 806 | 806 |
trash-common/src/main/java/com/trash/common/utils/reflect/ReflectUtils.java
| @@ -30,7 +30,7 @@ public class ReflectUtils | @@ -30,7 +30,7 @@ public class ReflectUtils | ||
| 30 | 30 | ||
| 31 | private static final String CGLIB_CLASS_SEPARATOR = "$$"; | 31 | private static final String CGLIB_CLASS_SEPARATOR = "$$"; |
| 32 | 32 | ||
| 33 | - private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); | 33 | + private static final Logger logger = LoggerFactory.getLogger(ReflectUtils.class); |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * 调用Getter方法. | 36 | * 调用Getter方法. |
trash-common/src/main/java/com/trash/common/utils/sign/Base64.java
| @@ -55,8 +55,8 @@ public final class Base64 | @@ -55,8 +55,8 @@ public final class Base64 | ||
| 55 | { | 55 | { |
| 56 | lookUpBase64Alphabet[i] = (char) ('0' + j); | 56 | lookUpBase64Alphabet[i] = (char) ('0' + j); |
| 57 | } | 57 | } |
| 58 | - lookUpBase64Alphabet[62] = (char) '+'; | ||
| 59 | - lookUpBase64Alphabet[63] = (char) '/'; | 58 | + lookUpBase64Alphabet[62] = '+'; |
| 59 | + lookUpBase64Alphabet[63] = '/'; | ||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | private static boolean isWhiteSpace(char octect) | 62 | private static boolean isWhiteSpace(char octect) |
| @@ -96,7 +96,7 @@ public final class Base64 | @@ -96,7 +96,7 @@ public final class Base64 | ||
| 96 | int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; | 96 | int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; |
| 97 | int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; | 97 | int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; |
| 98 | int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; | 98 | int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; |
| 99 | - char encodedData[] = null; | 99 | + char[] encodedData = null; |
| 100 | 100 | ||
| 101 | encodedData = new char[numberQuartet * 4]; | 101 | encodedData = new char[numberQuartet * 4]; |
| 102 | 102 | ||
| @@ -182,7 +182,7 @@ public final class Base64 | @@ -182,7 +182,7 @@ public final class Base64 | ||
| 182 | return new byte[0]; | 182 | return new byte[0]; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | - byte decodedData[] = null; | 185 | + byte[] decodedData = null; |
| 186 | byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; | 186 | byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; |
| 187 | char d1 = 0, d2 = 0, d3 = 0, d4 = 0; | 187 | char d1 = 0, d2 = 0, d3 = 0, d4 = 0; |
| 188 | 188 |
trash-common/src/main/java/com/trash/common/utils/sign/Md5Utils.java
| 1 | package com.trash.common.utils.sign; | 1 | package com.trash.common.utils.sign; |
| 2 | 2 | ||
| 3 | +import java.nio.charset.StandardCharsets; | ||
| 3 | import java.security.MessageDigest; | 4 | import java.security.MessageDigest; |
| 4 | import org.slf4j.Logger; | 5 | import org.slf4j.Logger; |
| 5 | import org.slf4j.LoggerFactory; | 6 | import org.slf4j.LoggerFactory; |
| @@ -20,7 +21,7 @@ public class Md5Utils | @@ -20,7 +21,7 @@ public class Md5Utils | ||
| 20 | { | 21 | { |
| 21 | algorithm = MessageDigest.getInstance("MD5"); | 22 | algorithm = MessageDigest.getInstance("MD5"); |
| 22 | algorithm.reset(); | 23 | algorithm.reset(); |
| 23 | - algorithm.update(s.getBytes("UTF-8")); | 24 | + algorithm.update(s.getBytes(StandardCharsets.UTF_8)); |
| 24 | byte[] messageDigest = algorithm.digest(); | 25 | byte[] messageDigest = algorithm.digest(); |
| 25 | return messageDigest; | 26 | return messageDigest; |
| 26 | } | 27 | } |
| @@ -31,7 +32,7 @@ public class Md5Utils | @@ -31,7 +32,7 @@ public class Md5Utils | ||
| 31 | return null; | 32 | return null; |
| 32 | } | 33 | } |
| 33 | 34 | ||
| 34 | - private static final String toHex(byte hash[]) | 35 | + private static final String toHex(byte[] hash) |
| 35 | { | 36 | { |
| 36 | if (hash == null) | 37 | if (hash == null) |
| 37 | { | 38 | { |
| @@ -55,7 +56,7 @@ public class Md5Utils | @@ -55,7 +56,7 @@ public class Md5Utils | ||
| 55 | { | 56 | { |
| 56 | try | 57 | try |
| 57 | { | 58 | { |
| 58 | - return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8"); | 59 | + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); |
| 59 | } | 60 | } |
| 60 | catch (Exception e) | 61 | catch (Exception e) |
| 61 | { | 62 | { |
trash-common/src/main/java/com/trash/common/utils/spring/SpringUtils.java
| @@ -60,7 +60,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC | @@ -60,7 +60,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC | ||
| 60 | */ | 60 | */ |
| 61 | public static <T> T getBean(Class<T> clz) throws BeansException | 61 | public static <T> T getBean(Class<T> clz) throws BeansException |
| 62 | { | 62 | { |
| 63 | - T result = (T) beanFactory.getBean(clz); | 63 | + T result = beanFactory.getBean(clz); |
| 64 | return result; | 64 | return result; |
| 65 | } | 65 | } |
| 66 | 66 |
trash-daily/src/main/java/com/trash/information_sharing/mapper/InformationSharingMapper.java
| @@ -18,7 +18,7 @@ public interface InformationSharingMapper | @@ -18,7 +18,7 @@ public interface InformationSharingMapper | ||
| 18 | * @param id 信息共享ID | 18 | * @param id 信息共享ID |
| 19 | * @return 信息共享 | 19 | * @return 信息共享 |
| 20 | */ | 20 | */ |
| 21 | - public InformationSharing selectInformationSharingById(Long id); | 21 | + InformationSharing selectInformationSharingById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询信息共享列表 | 24 | * 查询信息共享列表 |
| @@ -26,7 +26,7 @@ public interface InformationSharingMapper | @@ -26,7 +26,7 @@ public interface InformationSharingMapper | ||
| 26 | * @param informationSharing 信息共享 | 26 | * @param informationSharing 信息共享 |
| 27 | * @return 信息共享集合 | 27 | * @return 信息共享集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing); | 29 | + List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增信息共享 | 32 | * 新增信息共享 |
| @@ -34,7 +34,7 @@ public interface InformationSharingMapper | @@ -34,7 +34,7 @@ public interface InformationSharingMapper | ||
| 34 | * @param informationSharing 信息共享 | 34 | * @param informationSharing 信息共享 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertInformationSharing(InformationSharing informationSharing); | 37 | + int insertInformationSharing(InformationSharing informationSharing); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改信息共享 | 40 | * 修改信息共享 |
| @@ -42,7 +42,7 @@ public interface InformationSharingMapper | @@ -42,7 +42,7 @@ public interface InformationSharingMapper | ||
| 42 | * @param informationSharing 信息共享 | 42 | * @param informationSharing 信息共享 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateInformationSharing(InformationSharing informationSharing); | 45 | + int updateInformationSharing(InformationSharing informationSharing); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除信息共享 | 48 | * 删除信息共享 |
| @@ -50,7 +50,7 @@ public interface InformationSharingMapper | @@ -50,7 +50,7 @@ public interface InformationSharingMapper | ||
| 50 | * @param id 信息共享ID | 50 | * @param id 信息共享ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteInformationSharingById(Long id); | 53 | + int deleteInformationSharingById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除信息共享 | 56 | * 批量删除信息共享 |
| @@ -58,5 +58,5 @@ public interface InformationSharingMapper | @@ -58,5 +58,5 @@ public interface InformationSharingMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteInformationSharingByIds(Long[] ids); | 61 | + int deleteInformationSharingByIds(Long[] ids); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/information_sharing/service/IInformationSharingService.java
| @@ -18,7 +18,7 @@ public interface IInformationSharingService | @@ -18,7 +18,7 @@ public interface IInformationSharingService | ||
| 18 | * @param id 信息共享ID | 18 | * @param id 信息共享ID |
| 19 | * @return 信息共享 | 19 | * @return 信息共享 |
| 20 | */ | 20 | */ |
| 21 | - public InformationSharing selectInformationSharingById(Long id); | 21 | + InformationSharing selectInformationSharingById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询信息共享列表 | 24 | * 查询信息共享列表 |
| @@ -26,7 +26,7 @@ public interface IInformationSharingService | @@ -26,7 +26,7 @@ public interface IInformationSharingService | ||
| 26 | * @param informationSharing 信息共享 | 26 | * @param informationSharing 信息共享 |
| 27 | * @return 信息共享集合 | 27 | * @return 信息共享集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing); | 29 | + List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增信息共享 | 32 | * 新增信息共享 |
| @@ -34,7 +34,7 @@ public interface IInformationSharingService | @@ -34,7 +34,7 @@ public interface IInformationSharingService | ||
| 34 | * @param informationSharing 信息共享 | 34 | * @param informationSharing 信息共享 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertInformationSharing(InformationSharing informationSharing); | 37 | + int insertInformationSharing(InformationSharing informationSharing); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改信息共享 | 40 | * 修改信息共享 |
| @@ -42,7 +42,7 @@ public interface IInformationSharingService | @@ -42,7 +42,7 @@ public interface IInformationSharingService | ||
| 42 | * @param informationSharing 信息共享 | 42 | * @param informationSharing 信息共享 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateInformationSharing(InformationSharing informationSharing); | 45 | + int updateInformationSharing(InformationSharing informationSharing); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 批量删除信息共享 | 48 | * 批量删除信息共享 |
| @@ -50,7 +50,7 @@ public interface IInformationSharingService | @@ -50,7 +50,7 @@ public interface IInformationSharingService | ||
| 50 | * @param ids 需要删除的信息共享ID | 50 | * @param ids 需要删除的信息共享ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteInformationSharingByIds(Long[] ids); | 53 | + int deleteInformationSharingByIds(Long[] ids); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除信息共享信息 | 56 | * 删除信息共享信息 |
| @@ -58,5 +58,5 @@ public interface IInformationSharingService | @@ -58,5 +58,5 @@ public interface IInformationSharingService | ||
| 58 | * @param id 信息共享ID | 58 | * @param id 信息共享ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteInformationSharingById(Long id); | 61 | + int deleteInformationSharingById(Long id); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/report/mapper/WorkReportMapper.java
| @@ -18,7 +18,7 @@ public interface WorkReportMapper | @@ -18,7 +18,7 @@ public interface WorkReportMapper | ||
| 18 | * @param id 工作日报ID | 18 | * @param id 工作日报ID |
| 19 | * @return 工作日报 | 19 | * @return 工作日报 |
| 20 | */ | 20 | */ |
| 21 | - public WorkReport selectWorkReportById(Long id); | 21 | + WorkReport selectWorkReportById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询工作日报列表 | 24 | * 查询工作日报列表 |
| @@ -26,7 +26,7 @@ public interface WorkReportMapper | @@ -26,7 +26,7 @@ public interface WorkReportMapper | ||
| 26 | * @param workReport 工作日报 | 26 | * @param workReport 工作日报 |
| 27 | * @return 工作日报集合 | 27 | * @return 工作日报集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<WorkReport> selectWorkReportList(WorkReport workReport); | 29 | + List<WorkReport> selectWorkReportList(WorkReport workReport); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增工作日报 | 32 | * 新增工作日报 |
| @@ -34,7 +34,7 @@ public interface WorkReportMapper | @@ -34,7 +34,7 @@ public interface WorkReportMapper | ||
| 34 | * @param workReport 工作日报 | 34 | * @param workReport 工作日报 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertWorkReport(WorkReport workReport); | 37 | + int insertWorkReport(WorkReport workReport); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改工作日报 | 40 | * 修改工作日报 |
| @@ -42,7 +42,7 @@ public interface WorkReportMapper | @@ -42,7 +42,7 @@ public interface WorkReportMapper | ||
| 42 | * @param workReport 工作日报 | 42 | * @param workReport 工作日报 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateWorkReport(WorkReport workReport); | 45 | + int updateWorkReport(WorkReport workReport); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除工作日报 | 48 | * 删除工作日报 |
| @@ -50,7 +50,7 @@ public interface WorkReportMapper | @@ -50,7 +50,7 @@ public interface WorkReportMapper | ||
| 50 | * @param id 工作日报ID | 50 | * @param id 工作日报ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteWorkReportById(Long id); | 53 | + int deleteWorkReportById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除工作日报 | 56 | * 批量删除工作日报 |
| @@ -58,5 +58,5 @@ public interface WorkReportMapper | @@ -58,5 +58,5 @@ public interface WorkReportMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteWorkReportByIds(Long[] ids); | 61 | + int deleteWorkReportByIds(Long[] ids); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/report/service/IWorkReportService.java
| @@ -18,7 +18,7 @@ public interface IWorkReportService | @@ -18,7 +18,7 @@ public interface IWorkReportService | ||
| 18 | * @param id 工作日报ID | 18 | * @param id 工作日报ID |
| 19 | * @return 工作日报 | 19 | * @return 工作日报 |
| 20 | */ | 20 | */ |
| 21 | - public WorkReport selectWorkReportById(Long id); | 21 | + WorkReport selectWorkReportById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询工作日报列表 | 24 | * 查询工作日报列表 |
| @@ -26,7 +26,7 @@ public interface IWorkReportService | @@ -26,7 +26,7 @@ public interface IWorkReportService | ||
| 26 | * @param workReport 工作日报 | 26 | * @param workReport 工作日报 |
| 27 | * @return 工作日报集合 | 27 | * @return 工作日报集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<WorkReport> selectWorkReportList(WorkReport workReport); | 29 | + List<WorkReport> selectWorkReportList(WorkReport workReport); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增工作日报 | 32 | * 新增工作日报 |
| @@ -34,7 +34,7 @@ public interface IWorkReportService | @@ -34,7 +34,7 @@ public interface IWorkReportService | ||
| 34 | * @param workReport 工作日报 | 34 | * @param workReport 工作日报 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertWorkReport(WorkReport workReport); | 37 | + int insertWorkReport(WorkReport workReport); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改工作日报 | 40 | * 修改工作日报 |
| @@ -42,7 +42,7 @@ public interface IWorkReportService | @@ -42,7 +42,7 @@ public interface IWorkReportService | ||
| 42 | * @param workReport 工作日报 | 42 | * @param workReport 工作日报 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateWorkReport(WorkReport workReport); | 45 | + int updateWorkReport(WorkReport workReport); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 批量删除工作日报 | 48 | * 批量删除工作日报 |
| @@ -50,7 +50,7 @@ public interface IWorkReportService | @@ -50,7 +50,7 @@ public interface IWorkReportService | ||
| 50 | * @param ids 需要删除的工作日报ID | 50 | * @param ids 需要删除的工作日报ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteWorkReportByIds(Long[] ids); | 53 | + int deleteWorkReportByIds(Long[] ids); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除工作日报信息 | 56 | * 删除工作日报信息 |
| @@ -58,5 +58,5 @@ public interface IWorkReportService | @@ -58,5 +58,5 @@ public interface IWorkReportService | ||
| 58 | * @param id 工作日报ID | 58 | * @param id 工作日报ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteWorkReportById(Long id); | 61 | + int deleteWorkReportById(Long id); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/situation/mapper/DailySituationMapper.java
| @@ -18,7 +18,7 @@ public interface DailySituationMapper | @@ -18,7 +18,7 @@ public interface DailySituationMapper | ||
| 18 | * @param id 每日普查情况ID | 18 | * @param id 每日普查情况ID |
| 19 | * @return 每日普查情况 | 19 | * @return 每日普查情况 |
| 20 | */ | 20 | */ |
| 21 | - public DailySituation selectDailySituationById(String id); | 21 | + DailySituation selectDailySituationById(String id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询每日普查情况列表 | 24 | * 查询每日普查情况列表 |
| @@ -26,7 +26,7 @@ public interface DailySituationMapper | @@ -26,7 +26,7 @@ public interface DailySituationMapper | ||
| 26 | * @param dailySituation 每日普查情况 | 26 | * @param dailySituation 每日普查情况 |
| 27 | * @return 每日普查情况集合 | 27 | * @return 每日普查情况集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<DailySituation> selectDailySituationList(DailySituation dailySituation); | 29 | + List<DailySituation> selectDailySituationList(DailySituation dailySituation); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增每日普查情况 | 32 | * 新增每日普查情况 |
| @@ -34,7 +34,7 @@ public interface DailySituationMapper | @@ -34,7 +34,7 @@ public interface DailySituationMapper | ||
| 34 | * @param dailySituation 每日普查情况 | 34 | * @param dailySituation 每日普查情况 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertDailySituation(DailySituation dailySituation); | 37 | + int insertDailySituation(DailySituation dailySituation); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改每日普查情况 | 40 | * 修改每日普查情况 |
| @@ -42,7 +42,7 @@ public interface DailySituationMapper | @@ -42,7 +42,7 @@ public interface DailySituationMapper | ||
| 42 | * @param dailySituation 每日普查情况 | 42 | * @param dailySituation 每日普查情况 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateDailySituation(DailySituation dailySituation); | 45 | + int updateDailySituation(DailySituation dailySituation); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除每日普查情况 | 48 | * 删除每日普查情况 |
| @@ -50,7 +50,7 @@ public interface DailySituationMapper | @@ -50,7 +50,7 @@ public interface DailySituationMapper | ||
| 50 | * @param id 每日普查情况ID | 50 | * @param id 每日普查情况ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDailySituationById(String id); | 53 | + int deleteDailySituationById(String id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除每日普查情况 | 56 | * 批量删除每日普查情况 |
| @@ -58,5 +58,5 @@ public interface DailySituationMapper | @@ -58,5 +58,5 @@ public interface DailySituationMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDailySituationByIds(String[] ids); | 61 | + int deleteDailySituationByIds(String[] ids); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/situation/service/IDailySituationService.java
| @@ -18,7 +18,7 @@ public interface IDailySituationService | @@ -18,7 +18,7 @@ public interface IDailySituationService | ||
| 18 | * @param id 每日普查情况ID | 18 | * @param id 每日普查情况ID |
| 19 | * @return 每日普查情况 | 19 | * @return 每日普查情况 |
| 20 | */ | 20 | */ |
| 21 | - public DailySituation selectDailySituationById(String id); | 21 | + DailySituation selectDailySituationById(String id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询每日普查情况列表 | 24 | * 查询每日普查情况列表 |
| @@ -26,7 +26,7 @@ public interface IDailySituationService | @@ -26,7 +26,7 @@ public interface IDailySituationService | ||
| 26 | * @param dailySituation 每日普查情况 | 26 | * @param dailySituation 每日普查情况 |
| 27 | * @return 每日普查情况集合 | 27 | * @return 每日普查情况集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<DailySituation> selectDailySituationList(DailySituation dailySituation); | 29 | + List<DailySituation> selectDailySituationList(DailySituation dailySituation); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增每日普查情况 | 32 | * 新增每日普查情况 |
| @@ -34,7 +34,7 @@ public interface IDailySituationService | @@ -34,7 +34,7 @@ public interface IDailySituationService | ||
| 34 | * @param dailySituation 每日普查情况 | 34 | * @param dailySituation 每日普查情况 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertDailySituation(DailySituation dailySituation); | 37 | + int insertDailySituation(DailySituation dailySituation); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改每日普查情况 | 40 | * 修改每日普查情况 |
| @@ -42,7 +42,7 @@ public interface IDailySituationService | @@ -42,7 +42,7 @@ public interface IDailySituationService | ||
| 42 | * @param dailySituation 每日普查情况 | 42 | * @param dailySituation 每日普查情况 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateDailySituation(DailySituation dailySituation); | 45 | + int updateDailySituation(DailySituation dailySituation); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 批量删除每日普查情况 | 48 | * 批量删除每日普查情况 |
| @@ -50,7 +50,7 @@ public interface IDailySituationService | @@ -50,7 +50,7 @@ public interface IDailySituationService | ||
| 50 | * @param ids 需要删除的每日普查情况ID | 50 | * @param ids 需要删除的每日普查情况ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDailySituationByIds(String[] ids); | 53 | + int deleteDailySituationByIds(String[] ids); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除每日普查情况信息 | 56 | * 删除每日普查情况信息 |
| @@ -58,5 +58,5 @@ public interface IDailySituationService | @@ -58,5 +58,5 @@ public interface IDailySituationService | ||
| 58 | * @param id 每日普查情况ID | 58 | * @param id 每日普查情况ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDailySituationById(String id); | 61 | + int deleteDailySituationById(String id); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/toollist/mapper/DailyToolListMapper.java
| @@ -18,7 +18,7 @@ public interface DailyToolListMapper | @@ -18,7 +18,7 @@ public interface DailyToolListMapper | ||
| 18 | * @param id 每日工作清单ID | 18 | * @param id 每日工作清单ID |
| 19 | * @return 每日工作清单 | 19 | * @return 每日工作清单 |
| 20 | */ | 20 | */ |
| 21 | - public DailyToolList selectDailyToolListById(Long id); | 21 | + DailyToolList selectDailyToolListById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询每日工作清单列表 | 24 | * 查询每日工作清单列表 |
| @@ -26,7 +26,7 @@ public interface DailyToolListMapper | @@ -26,7 +26,7 @@ public interface DailyToolListMapper | ||
| 26 | * @param dailyToolList 每日工作清单 | 26 | * @param dailyToolList 每日工作清单 |
| 27 | * @return 每日工作清单集合 | 27 | * @return 每日工作清单集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList); | 29 | + List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增每日工作清单 | 32 | * 新增每日工作清单 |
| @@ -34,7 +34,7 @@ public interface DailyToolListMapper | @@ -34,7 +34,7 @@ public interface DailyToolListMapper | ||
| 34 | * @param dailyToolList 每日工作清单 | 34 | * @param dailyToolList 每日工作清单 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertDailyToolList(DailyToolList dailyToolList); | 37 | + int insertDailyToolList(DailyToolList dailyToolList); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改每日工作清单 | 40 | * 修改每日工作清单 |
| @@ -42,7 +42,7 @@ public interface DailyToolListMapper | @@ -42,7 +42,7 @@ public interface DailyToolListMapper | ||
| 42 | * @param dailyToolList 每日工作清单 | 42 | * @param dailyToolList 每日工作清单 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateDailyToolList(DailyToolList dailyToolList); | 45 | + int updateDailyToolList(DailyToolList dailyToolList); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除每日工作清单 | 48 | * 删除每日工作清单 |
| @@ -50,7 +50,7 @@ public interface DailyToolListMapper | @@ -50,7 +50,7 @@ public interface DailyToolListMapper | ||
| 50 | * @param id 每日工作清单ID | 50 | * @param id 每日工作清单ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDailyToolListById(Long id); | 53 | + int deleteDailyToolListById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除每日工作清单 | 56 | * 批量删除每日工作清单 |
| @@ -58,5 +58,5 @@ public interface DailyToolListMapper | @@ -58,5 +58,5 @@ public interface DailyToolListMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDailyToolListByIds(Long[] ids); | 61 | + int deleteDailyToolListByIds(Long[] ids); |
| 62 | } | 62 | } |
trash-daily/src/main/java/com/trash/toollist/service/IDailyToolListService.java
| @@ -18,7 +18,7 @@ public interface IDailyToolListService | @@ -18,7 +18,7 @@ public interface IDailyToolListService | ||
| 18 | * @param id 每日工作清单ID | 18 | * @param id 每日工作清单ID |
| 19 | * @return 每日工作清单 | 19 | * @return 每日工作清单 |
| 20 | */ | 20 | */ |
| 21 | - public DailyToolList selectDailyToolListById(Long id); | 21 | + DailyToolList selectDailyToolListById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询每日工作清单列表 | 24 | * 查询每日工作清单列表 |
| @@ -26,7 +26,7 @@ public interface IDailyToolListService | @@ -26,7 +26,7 @@ public interface IDailyToolListService | ||
| 26 | * @param dailyToolList 每日工作清单 | 26 | * @param dailyToolList 每日工作清单 |
| 27 | * @return 每日工作清单集合 | 27 | * @return 每日工作清单集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList); | 29 | + List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增每日工作清单 | 32 | * 新增每日工作清单 |
| @@ -34,7 +34,7 @@ public interface IDailyToolListService | @@ -34,7 +34,7 @@ public interface IDailyToolListService | ||
| 34 | * @param dailyToolList 每日工作清单 | 34 | * @param dailyToolList 每日工作清单 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertDailyToolList(DailyToolList dailyToolList); | 37 | + int insertDailyToolList(DailyToolList dailyToolList); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改每日工作清单 | 40 | * 修改每日工作清单 |
| @@ -42,7 +42,7 @@ public interface IDailyToolListService | @@ -42,7 +42,7 @@ public interface IDailyToolListService | ||
| 42 | * @param dailyToolList 每日工作清单 | 42 | * @param dailyToolList 每日工作清单 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateDailyToolList(DailyToolList dailyToolList); | 45 | + int updateDailyToolList(DailyToolList dailyToolList); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 批量删除每日工作清单 | 48 | * 批量删除每日工作清单 |
| @@ -50,7 +50,7 @@ public interface IDailyToolListService | @@ -50,7 +50,7 @@ public interface IDailyToolListService | ||
| 50 | * @param ids 需要删除的每日工作清单ID | 50 | * @param ids 需要删除的每日工作清单ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDailyToolListByIds(Long[] ids); | 53 | + int deleteDailyToolListByIds(Long[] ids); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除每日工作清单信息 | 56 | * 删除每日工作清单信息 |
| @@ -58,5 +58,5 @@ public interface IDailyToolListService | @@ -58,5 +58,5 @@ public interface IDailyToolListService | ||
| 58 | * @param id 每日工作清单ID | 58 | * @param id 每日工作清单ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDailyToolListById(Long id); | 61 | + int deleteDailyToolListById(Long id); |
| 62 | } | 62 | } |
trash-framework/src/main/java/com/trash/framework/config/FastJson2JsonRedisSerializer.java
| @@ -10,6 +10,7 @@ import org.springframework.data.redis.serializer.SerializationException; | @@ -10,6 +10,7 @@ import org.springframework.data.redis.serializer.SerializationException; | ||
| 10 | import com.alibaba.fastjson.parser.ParserConfig; | 10 | import com.alibaba.fastjson.parser.ParserConfig; |
| 11 | import org.springframework.util.Assert; | 11 | import org.springframework.util.Assert; |
| 12 | import java.nio.charset.Charset; | 12 | import java.nio.charset.Charset; |
| 13 | +import java.nio.charset.StandardCharsets; | ||
| 13 | 14 | ||
| 14 | /** | 15 | /** |
| 15 | * Redis使用FastJson序列化 | 16 | * Redis使用FastJson序列化 |
| @@ -21,9 +22,9 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | @@ -21,9 +22,9 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | ||
| 21 | @SuppressWarnings("unused") | 22 | @SuppressWarnings("unused") |
| 22 | private ObjectMapper objectMapper = new ObjectMapper(); | 23 | private ObjectMapper objectMapper = new ObjectMapper(); |
| 23 | 24 | ||
| 24 | - public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); | 25 | + public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; |
| 25 | 26 | ||
| 26 | - private Class<T> clazz; | 27 | + private final Class<T> clazz; |
| 27 | 28 | ||
| 28 | static | 29 | static |
| 29 | { | 30 | { |
trash-framework/src/main/java/com/trash/framework/config/MyBatisConfig.java
| @@ -37,7 +37,7 @@ public class MyBatisConfig | @@ -37,7 +37,7 @@ public class MyBatisConfig | ||
| 37 | 37 | ||
| 38 | public static String setTypeAliasesPackage(String typeAliasesPackage) | 38 | public static String setTypeAliasesPackage(String typeAliasesPackage) |
| 39 | { | 39 | { |
| 40 | - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); | 40 | + ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); |
| 41 | MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); | 41 | MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); |
| 42 | List<String> allResult = new ArrayList<String>(); | 42 | List<String> allResult = new ArrayList<String>(); |
| 43 | try | 43 | try |
| @@ -75,7 +75,7 @@ public class MyBatisConfig | @@ -75,7 +75,7 @@ public class MyBatisConfig | ||
| 75 | } | 75 | } |
| 76 | if (allResult.size() > 0) | 76 | if (allResult.size() > 0) |
| 77 | { | 77 | { |
| 78 | - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); | 78 | + typeAliasesPackage = String.join(",", allResult.toArray(new String[0])); |
| 79 | } | 79 | } |
| 80 | else | 80 | else |
| 81 | { | 81 | { |
trash-framework/src/main/java/com/trash/framework/config/ThreadPoolConfig.java
| @@ -19,16 +19,16 @@ import com.trash.common.utils.Threads; | @@ -19,16 +19,16 @@ import com.trash.common.utils.Threads; | ||
| 19 | public class ThreadPoolConfig | 19 | public class ThreadPoolConfig |
| 20 | { | 20 | { |
| 21 | // 核心线程池大小 | 21 | // 核心线程池大小 |
| 22 | - private int corePoolSize = 50; | 22 | + private final int corePoolSize = 50; |
| 23 | 23 | ||
| 24 | // 最大可创建的线程数 | 24 | // 最大可创建的线程数 |
| 25 | - private int maxPoolSize = 200; | 25 | + private final int maxPoolSize = 200; |
| 26 | 26 | ||
| 27 | // 队列最大长度 | 27 | // 队列最大长度 |
| 28 | - private int queueCapacity = 1000; | 28 | + private final int queueCapacity = 1000; |
| 29 | 29 | ||
| 30 | // 线程池维护线程所允许的空闲时间 | 30 | // 线程池维护线程所允许的空闲时间 |
| 31 | - private int keepAliveSeconds = 300; | 31 | + private final int keepAliveSeconds = 300; |
| 32 | 32 | ||
| 33 | @Bean(name = "threadPoolTaskExecutor") | 33 | @Bean(name = "threadPoolTaskExecutor") |
| 34 | public ThreadPoolTaskExecutor threadPoolTaskExecutor() | 34 | public ThreadPoolTaskExecutor threadPoolTaskExecutor() |
trash-framework/src/main/java/com/trash/framework/interceptor/impl/SameUrlDataInterceptor.java
| @@ -116,10 +116,6 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor | @@ -116,10 +116,6 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor | ||
| 116 | { | 116 | { |
| 117 | long time1 = (Long) nowMap.get(REPEAT_TIME); | 117 | long time1 = (Long) nowMap.get(REPEAT_TIME); |
| 118 | long time2 = (Long) preMap.get(REPEAT_TIME); | 118 | long time2 = (Long) preMap.get(REPEAT_TIME); |
| 119 | - if ((time1 - time2) < (this.intervalTime * 1000)) | ||
| 120 | - { | ||
| 121 | - return true; | ||
| 122 | - } | ||
| 123 | - return false; | 119 | + return (time1 - time2) < (this.intervalTime * 1000); |
| 124 | } | 120 | } |
| 125 | } | 121 | } |
trash-framework/src/main/java/com/trash/framework/manager/AsyncManager.java
| @@ -22,14 +22,14 @@ public class AsyncManager | @@ -22,14 +22,14 @@ public class AsyncManager | ||
| 22 | /** | 22 | /** |
| 23 | * 异步操作任务调度线程池 | 23 | * 异步操作任务调度线程池 |
| 24 | */ | 24 | */ |
| 25 | - private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); | 25 | + private final ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); |
| 26 | 26 | ||
| 27 | /** | 27 | /** |
| 28 | * 单例模式 | 28 | * 单例模式 |
| 29 | */ | 29 | */ |
| 30 | private AsyncManager(){} | 30 | private AsyncManager(){} |
| 31 | 31 | ||
| 32 | - private static AsyncManager me = new AsyncManager(); | 32 | + private static final AsyncManager me = new AsyncManager(); |
| 33 | 33 | ||
| 34 | public static AsyncManager me() | 34 | public static AsyncManager me() |
| 35 | { | 35 | { |
trash-generator/src/main/java/com/trash/generator/domain/GenTableColumn.java
| @@ -356,7 +356,7 @@ public class GenTableColumn extends BaseEntity | @@ -356,7 +356,7 @@ public class GenTableColumn extends BaseEntity | ||
| 356 | { | 356 | { |
| 357 | Object startStr = value.subSequence(0, 1); | 357 | Object startStr = value.subSequence(0, 1); |
| 358 | String endStr = value.substring(1); | 358 | String endStr = value.substring(1); |
| 359 | - sb.append("").append(startStr).append("=").append(endStr).append(","); | 359 | + sb.append(startStr).append("=").append(endStr).append(","); |
| 360 | } | 360 | } |
| 361 | } | 361 | } |
| 362 | return sb.deleteCharAt(sb.length() - 1).toString(); | 362 | return sb.deleteCharAt(sb.length() - 1).toString(); |
trash-generator/src/main/java/com/trash/generator/mapper/GenTableColumnMapper.java
| @@ -17,7 +17,7 @@ public interface GenTableColumnMapper | @@ -17,7 +17,7 @@ public interface GenTableColumnMapper | ||
| 17 | * @param tableName 表名称 | 17 | * @param tableName 表名称 |
| 18 | * @return 列信息 | 18 | * @return 列信息 |
| 19 | */ | 19 | */ |
| 20 | - public List<GenTableColumn> selectDbTableColumnsByName(String tableName); | 20 | + List<GenTableColumn> selectDbTableColumnsByName(String tableName); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询业务字段列表 | 23 | * 查询业务字段列表 |
| @@ -25,7 +25,7 @@ public interface GenTableColumnMapper | @@ -25,7 +25,7 @@ public interface GenTableColumnMapper | ||
| 25 | * @param tableId 业务字段编号 | 25 | * @param tableId 业务字段编号 |
| 26 | * @return 业务字段集合 | 26 | * @return 业务字段集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); | 28 | + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增业务字段 | 31 | * 新增业务字段 |
| @@ -33,7 +33,7 @@ public interface GenTableColumnMapper | @@ -33,7 +33,7 @@ public interface GenTableColumnMapper | ||
| 33 | * @param genTableColumn 业务字段信息 | 33 | * @param genTableColumn 业务字段信息 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertGenTableColumn(GenTableColumn genTableColumn); | 36 | + int insertGenTableColumn(GenTableColumn genTableColumn); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改业务字段 | 39 | * 修改业务字段 |
| @@ -41,7 +41,7 @@ public interface GenTableColumnMapper | @@ -41,7 +41,7 @@ public interface GenTableColumnMapper | ||
| 41 | * @param genTableColumn 业务字段信息 | 41 | * @param genTableColumn 业务字段信息 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateGenTableColumn(GenTableColumn genTableColumn); | 44 | + int updateGenTableColumn(GenTableColumn genTableColumn); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 删除业务字段 | 47 | * 删除业务字段 |
| @@ -49,7 +49,7 @@ public interface GenTableColumnMapper | @@ -49,7 +49,7 @@ public interface GenTableColumnMapper | ||
| 49 | * @param genTableColumns 列数据 | 49 | * @param genTableColumns 列数据 |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteGenTableColumns(List<GenTableColumn> genTableColumns); | 52 | + int deleteGenTableColumns(List<GenTableColumn> genTableColumns); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除业务字段 | 55 | * 批量删除业务字段 |
| @@ -57,5 +57,5 @@ public interface GenTableColumnMapper | @@ -57,5 +57,5 @@ public interface GenTableColumnMapper | ||
| 57 | * @param ids 需要删除的数据ID | 57 | * @param ids 需要删除的数据ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteGenTableColumnByIds(Long[] ids); | 60 | + int deleteGenTableColumnByIds(Long[] ids); |
| 61 | } | 61 | } |
trash-generator/src/main/java/com/trash/generator/mapper/GenTableMapper.java
| @@ -17,7 +17,7 @@ public interface GenTableMapper | @@ -17,7 +17,7 @@ public interface GenTableMapper | ||
| 17 | * @param genTable 业务信息 | 17 | * @param genTable 业务信息 |
| 18 | * @return 业务集合 | 18 | * @return 业务集合 |
| 19 | */ | 19 | */ |
| 20 | - public List<GenTable> selectGenTableList(GenTable genTable); | 20 | + List<GenTable> selectGenTableList(GenTable genTable); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询据库列表 | 23 | * 查询据库列表 |
| @@ -25,7 +25,7 @@ public interface GenTableMapper | @@ -25,7 +25,7 @@ public interface GenTableMapper | ||
| 25 | * @param genTable 业务信息 | 25 | * @param genTable 业务信息 |
| 26 | * @return 数据库表集合 | 26 | * @return 数据库表集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<GenTable> selectDbTableList(GenTable genTable); | 28 | + List<GenTable> selectDbTableList(GenTable genTable); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 查询据库列表 | 31 | * 查询据库列表 |
| @@ -33,7 +33,7 @@ public interface GenTableMapper | @@ -33,7 +33,7 @@ public interface GenTableMapper | ||
| 33 | * @param tableNames 表名称组 | 33 | * @param tableNames 表名称组 |
| 34 | * @return 数据库表集合 | 34 | * @return 数据库表集合 |
| 35 | */ | 35 | */ |
| 36 | - public List<GenTable> selectDbTableListByNames(String[] tableNames); | 36 | + List<GenTable> selectDbTableListByNames(String[] tableNames); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 查询表ID业务信息 | 39 | * 查询表ID业务信息 |
| @@ -41,7 +41,7 @@ public interface GenTableMapper | @@ -41,7 +41,7 @@ public interface GenTableMapper | ||
| 41 | * @param id 业务ID | 41 | * @param id 业务ID |
| 42 | * @return 业务信息 | 42 | * @return 业务信息 |
| 43 | */ | 43 | */ |
| 44 | - public GenTable selectGenTableById(Long id); | 44 | + GenTable selectGenTableById(Long id); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 查询表名称业务信息 | 47 | * 查询表名称业务信息 |
| @@ -49,7 +49,7 @@ public interface GenTableMapper | @@ -49,7 +49,7 @@ public interface GenTableMapper | ||
| 49 | * @param tableName 表名称 | 49 | * @param tableName 表名称 |
| 50 | * @return 业务信息 | 50 | * @return 业务信息 |
| 51 | */ | 51 | */ |
| 52 | - public GenTable selectGenTableByName(String tableName); | 52 | + GenTable selectGenTableByName(String tableName); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 新增业务 | 55 | * 新增业务 |
| @@ -57,7 +57,7 @@ public interface GenTableMapper | @@ -57,7 +57,7 @@ public interface GenTableMapper | ||
| 57 | * @param genTable 业务信息 | 57 | * @param genTable 业务信息 |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int insertGenTable(GenTable genTable); | 60 | + int insertGenTable(GenTable genTable); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 修改业务 | 63 | * 修改业务 |
| @@ -65,7 +65,7 @@ public interface GenTableMapper | @@ -65,7 +65,7 @@ public interface GenTableMapper | ||
| 65 | * @param genTable 业务信息 | 65 | * @param genTable 业务信息 |
| 66 | * @return 结果 | 66 | * @return 结果 |
| 67 | */ | 67 | */ |
| 68 | - public int updateGenTable(GenTable genTable); | 68 | + int updateGenTable(GenTable genTable); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 批量删除业务 | 71 | * 批量删除业务 |
| @@ -73,5 +73,5 @@ public interface GenTableMapper | @@ -73,5 +73,5 @@ public interface GenTableMapper | ||
| 73 | * @param ids 需要删除的数据ID | 73 | * @param ids 需要删除的数据ID |
| 74 | * @return 结果 | 74 | * @return 结果 |
| 75 | */ | 75 | */ |
| 76 | - public int deleteGenTableByIds(Long[] ids); | 76 | + int deleteGenTableByIds(Long[] ids); |
| 77 | } | 77 | } |
trash-generator/src/main/java/com/trash/generator/service/IGenTableColumnService.java
| @@ -17,7 +17,7 @@ public interface IGenTableColumnService | @@ -17,7 +17,7 @@ public interface IGenTableColumnService | ||
| 17 | * @param tableId 业务字段编号 | 17 | * @param tableId 业务字段编号 |
| 18 | * @return 业务字段集合 | 18 | * @return 业务字段集合 |
| 19 | */ | 19 | */ |
| 20 | - public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); | 20 | + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 新增业务字段 | 23 | * 新增业务字段 |
| @@ -25,7 +25,7 @@ public interface IGenTableColumnService | @@ -25,7 +25,7 @@ public interface IGenTableColumnService | ||
| 25 | * @param genTableColumn 业务字段信息 | 25 | * @param genTableColumn 业务字段信息 |
| 26 | * @return 结果 | 26 | * @return 结果 |
| 27 | */ | 27 | */ |
| 28 | - public int insertGenTableColumn(GenTableColumn genTableColumn); | 28 | + int insertGenTableColumn(GenTableColumn genTableColumn); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 修改业务字段 | 31 | * 修改业务字段 |
| @@ -33,7 +33,7 @@ public interface IGenTableColumnService | @@ -33,7 +33,7 @@ public interface IGenTableColumnService | ||
| 33 | * @param genTableColumn 业务字段信息 | 33 | * @param genTableColumn 业务字段信息 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int updateGenTableColumn(GenTableColumn genTableColumn); | 36 | + int updateGenTableColumn(GenTableColumn genTableColumn); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 删除业务字段信息 | 39 | * 删除业务字段信息 |
| @@ -41,5 +41,5 @@ public interface IGenTableColumnService | @@ -41,5 +41,5 @@ public interface IGenTableColumnService | ||
| 41 | * @param ids 需要删除的数据ID | 41 | * @param ids 需要删除的数据ID |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int deleteGenTableColumnByIds(String ids); | 44 | + int deleteGenTableColumnByIds(String ids); |
| 45 | } | 45 | } |
trash-generator/src/main/java/com/trash/generator/service/IGenTableService.java
| @@ -18,7 +18,7 @@ public interface IGenTableService | @@ -18,7 +18,7 @@ public interface IGenTableService | ||
| 18 | * @param genTable 业务信息 | 18 | * @param genTable 业务信息 |
| 19 | * @return 业务集合 | 19 | * @return 业务集合 |
| 20 | */ | 20 | */ |
| 21 | - public List<GenTable> selectGenTableList(GenTable genTable); | 21 | + List<GenTable> selectGenTableList(GenTable genTable); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询据库列表 | 24 | * 查询据库列表 |
| @@ -26,7 +26,7 @@ public interface IGenTableService | @@ -26,7 +26,7 @@ public interface IGenTableService | ||
| 26 | * @param genTable 业务信息 | 26 | * @param genTable 业务信息 |
| 27 | * @return 数据库表集合 | 27 | * @return 数据库表集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<GenTable> selectDbTableList(GenTable genTable); | 29 | + List<GenTable> selectDbTableList(GenTable genTable); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 查询据库列表 | 32 | * 查询据库列表 |
| @@ -34,7 +34,7 @@ public interface IGenTableService | @@ -34,7 +34,7 @@ public interface IGenTableService | ||
| 34 | * @param tableNames 表名称组 | 34 | * @param tableNames 表名称组 |
| 35 | * @return 数据库表集合 | 35 | * @return 数据库表集合 |
| 36 | */ | 36 | */ |
| 37 | - public List<GenTable> selectDbTableListByNames(String[] tableNames); | 37 | + List<GenTable> selectDbTableListByNames(String[] tableNames); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 查询业务信息 | 40 | * 查询业务信息 |
| @@ -42,7 +42,7 @@ public interface IGenTableService | @@ -42,7 +42,7 @@ public interface IGenTableService | ||
| 42 | * @param id 业务ID | 42 | * @param id 业务ID |
| 43 | * @return 业务信息 | 43 | * @return 业务信息 |
| 44 | */ | 44 | */ |
| 45 | - public GenTable selectGenTableById(Long id); | 45 | + GenTable selectGenTableById(Long id); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 修改业务 | 48 | * 修改业务 |
| @@ -50,7 +50,7 @@ public interface IGenTableService | @@ -50,7 +50,7 @@ public interface IGenTableService | ||
| 50 | * @param genTable 业务信息 | 50 | * @param genTable 业务信息 |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public void updateGenTable(GenTable genTable); | 53 | + void updateGenTable(GenTable genTable); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除业务信息 | 56 | * 删除业务信息 |
| @@ -58,14 +58,14 @@ public interface IGenTableService | @@ -58,14 +58,14 @@ public interface IGenTableService | ||
| 58 | * @param tableIds 需要删除的表数据ID | 58 | * @param tableIds 需要删除的表数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public void deleteGenTableByIds(Long[] tableIds); | 61 | + void deleteGenTableByIds(Long[] tableIds); |
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * 导入表结构 | 64 | * 导入表结构 |
| 65 | * | 65 | * |
| 66 | * @param tableList 导入表列表 | 66 | * @param tableList 导入表列表 |
| 67 | */ | 67 | */ |
| 68 | - public void importGenTable(List<GenTable> tableList); | 68 | + void importGenTable(List<GenTable> tableList); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 预览代码 | 71 | * 预览代码 |
| @@ -73,7 +73,7 @@ public interface IGenTableService | @@ -73,7 +73,7 @@ public interface IGenTableService | ||
| 73 | * @param tableId 表编号 | 73 | * @param tableId 表编号 |
| 74 | * @return 预览数据列表 | 74 | * @return 预览数据列表 |
| 75 | */ | 75 | */ |
| 76 | - public Map<String, String> previewCode(Long tableId); | 76 | + Map<String, String> previewCode(Long tableId); |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * 生成代码（下载方式） | 79 | * 生成代码（下载方式） |
| @@ -81,7 +81,7 @@ public interface IGenTableService | @@ -81,7 +81,7 @@ public interface IGenTableService | ||
| 81 | * @param tableName 表名称 | 81 | * @param tableName 表名称 |
| 82 | * @return 数据 | 82 | * @return 数据 |
| 83 | */ | 83 | */ |
| 84 | - public byte[] downloadCode(String tableName); | 84 | + byte[] downloadCode(String tableName); |
| 85 | 85 | ||
| 86 | /** | 86 | /** |
| 87 | * 生成代码（自定义路径） | 87 | * 生成代码（自定义路径） |
| @@ -89,14 +89,14 @@ public interface IGenTableService | @@ -89,14 +89,14 @@ public interface IGenTableService | ||
| 89 | * @param tableName 表名称 | 89 | * @param tableName 表名称 |
| 90 | * @return 数据 | 90 | * @return 数据 |
| 91 | */ | 91 | */ |
| 92 | - public void generatorCode(String tableName); | 92 | + void generatorCode(String tableName); |
| 93 | 93 | ||
| 94 | /** | 94 | /** |
| 95 | * 同步数据库 | 95 | * 同步数据库 |
| 96 | * | 96 | * |
| 97 | * @param tableName 表名称 | 97 | * @param tableName 表名称 |
| 98 | */ | 98 | */ |
| 99 | - public void synchDb(String tableName); | 99 | + void synchDb(String tableName); |
| 100 | 100 | ||
| 101 | /** | 101 | /** |
| 102 | * 批量生成代码（下载方式） | 102 | * 批量生成代码（下载方式） |
| @@ -104,12 +104,12 @@ public interface IGenTableService | @@ -104,12 +104,12 @@ public interface IGenTableService | ||
| 104 | * @param tableNames 表数组 | 104 | * @param tableNames 表数组 |
| 105 | * @return 数据 | 105 | * @return 数据 |
| 106 | */ | 106 | */ |
| 107 | - public byte[] downloadCode(String[] tableNames); | 107 | + byte[] downloadCode(String[] tableNames); |
| 108 | 108 | ||
| 109 | /** | 109 | /** |
| 110 | * 修改保存参数校验 | 110 | * 修改保存参数校验 |
| 111 | * | 111 | * |
| 112 | * @param genTable 业务信息 | 112 | * @param genTable 业务信息 |
| 113 | */ | 113 | */ |
| 114 | - public void validateEdit(GenTable genTable); | 114 | + void validateEdit(GenTable genTable); |
| 115 | } | 115 | } |
trash-generator/src/main/resources/vm/java/mapper.java.vm
| @@ -17,7 +17,7 @@ public interface ${ClassName}Mapper | @@ -17,7 +17,7 @@ public interface ${ClassName}Mapper | ||
| 17 | * @param ${pkColumn.javaField} ${functionName}ID | 17 | * @param ${pkColumn.javaField} ${functionName}ID |
| 18 | * @return ${functionName} | 18 | * @return ${functionName} |
| 19 | */ | 19 | */ |
| 20 | - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); | 20 | + ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询${functionName}列表 | 23 | * 查询${functionName}列表 |
| @@ -25,7 +25,7 @@ public interface ${ClassName}Mapper | @@ -25,7 +25,7 @@ public interface ${ClassName}Mapper | ||
| 25 | * @param ${className} ${functionName} | 25 | * @param ${className} ${functionName} |
| 26 | * @return ${functionName}集合 | 26 | * @return ${functionName}集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); | 28 | + List<${ClassName}> select${ClassName}List(${ClassName} ${className}); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增${functionName} | 31 | * 新增${functionName} |
| @@ -33,7 +33,7 @@ public interface ${ClassName}Mapper | @@ -33,7 +33,7 @@ public interface ${ClassName}Mapper | ||
| 33 | * @param ${className} ${functionName} | 33 | * @param ${className} ${functionName} |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insert${ClassName}(${ClassName} ${className}); | 36 | + int insert${ClassName}(${ClassName} ${className}); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改${functionName} | 39 | * 修改${functionName} |
| @@ -41,7 +41,7 @@ public interface ${ClassName}Mapper | @@ -41,7 +41,7 @@ public interface ${ClassName}Mapper | ||
| 41 | * @param ${className} ${functionName} | 41 | * @param ${className} ${functionName} |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int update${ClassName}(${ClassName} ${className}); | 44 | + int update${ClassName}(${ClassName} ${className}); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 删除${functionName} | 47 | * 删除${functionName} |
| @@ -49,7 +49,7 @@ public interface ${ClassName}Mapper | @@ -49,7 +49,7 @@ public interface ${ClassName}Mapper | ||
| 49 | * @param ${pkColumn.javaField} ${functionName}ID | 49 | * @param ${pkColumn.javaField} ${functionName}ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); | 52 | + int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除${functionName} | 55 | * 批量删除${functionName} |
| @@ -57,5 +57,5 @@ public interface ${ClassName}Mapper | @@ -57,5 +57,5 @@ public interface ${ClassName}Mapper | ||
| 57 | * @param ${pkColumn.javaField}s 需要删除的数据ID | 57 | * @param ${pkColumn.javaField}s 需要删除的数据ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); | 60 | + int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); |
| 61 | } | 61 | } |
trash-generator/src/main/resources/vm/java/service.java.vm
| @@ -17,7 +17,7 @@ public interface I${ClassName}Service | @@ -17,7 +17,7 @@ public interface I${ClassName}Service | ||
| 17 | * @param ${pkColumn.javaField} ${functionName}ID | 17 | * @param ${pkColumn.javaField} ${functionName}ID |
| 18 | * @return ${functionName} | 18 | * @return ${functionName} |
| 19 | */ | 19 | */ |
| 20 | - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); | 20 | + ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询${functionName}列表 | 23 | * 查询${functionName}列表 |
| @@ -25,7 +25,7 @@ public interface I${ClassName}Service | @@ -25,7 +25,7 @@ public interface I${ClassName}Service | ||
| 25 | * @param ${className} ${functionName} | 25 | * @param ${className} ${functionName} |
| 26 | * @return ${functionName}集合 | 26 | * @return ${functionName}集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); | 28 | + List<${ClassName}> select${ClassName}List(${ClassName} ${className}); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增${functionName} | 31 | * 新增${functionName} |
| @@ -33,7 +33,7 @@ public interface I${ClassName}Service | @@ -33,7 +33,7 @@ public interface I${ClassName}Service | ||
| 33 | * @param ${className} ${functionName} | 33 | * @param ${className} ${functionName} |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insert${ClassName}(${ClassName} ${className}); | 36 | + int insert${ClassName}(${ClassName} ${className}); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改${functionName} | 39 | * 修改${functionName} |
| @@ -41,7 +41,7 @@ public interface I${ClassName}Service | @@ -41,7 +41,7 @@ public interface I${ClassName}Service | ||
| 41 | * @param ${className} ${functionName} | 41 | * @param ${className} ${functionName} |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int update${ClassName}(${ClassName} ${className}); | 44 | + int update${ClassName}(${ClassName} ${className}); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 批量删除${functionName} | 47 | * 批量删除${functionName} |
| @@ -49,7 +49,7 @@ public interface I${ClassName}Service | @@ -49,7 +49,7 @@ public interface I${ClassName}Service | ||
| 49 | * @param ${pkColumn.javaField}s 需要删除的${functionName}ID | 49 | * @param ${pkColumn.javaField}s 需要删除的${functionName}ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); | 52 | + int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 删除${functionName}信息 | 55 | * 删除${functionName}信息 |
| @@ -57,5 +57,5 @@ public interface I${ClassName}Service | @@ -57,5 +57,5 @@ public interface I${ClassName}Service | ||
| 57 | * @param ${pkColumn.javaField} ${functionName}ID | 57 | * @param ${pkColumn.javaField} ${functionName}ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); | 60 | + int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); |
| 61 | } | 61 | } |
trash-quartz/src/main/java/com/trash/quartz/mapper/SysJobLogMapper.java
| @@ -17,14 +17,14 @@ public interface SysJobLogMapper | @@ -17,14 +17,14 @@ public interface SysJobLogMapper | ||
| 17 | * @param jobLog 调度日志信息 | 17 | * @param jobLog 调度日志信息 |
| 18 | * @return 调度任务日志集合 | 18 | * @return 调度任务日志集合 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysJobLog> selectJobLogList(SysJobLog jobLog); | 20 | + List<SysJobLog> selectJobLogList(SysJobLog jobLog); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询所有调度任务日志 | 23 | * 查询所有调度任务日志 |
| 24 | * | 24 | * |
| 25 | * @return 调度任务日志列表 | 25 | * @return 调度任务日志列表 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysJobLog> selectJobLogAll(); | 27 | + List<SysJobLog> selectJobLogAll(); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 通过调度任务日志ID查询调度信息 | 30 | * 通过调度任务日志ID查询调度信息 |
| @@ -32,7 +32,7 @@ public interface SysJobLogMapper | @@ -32,7 +32,7 @@ public interface SysJobLogMapper | ||
| 32 | * @param jobLogId 调度任务日志ID | 32 | * @param jobLogId 调度任务日志ID |
| 33 | * @return 调度任务日志对象信息 | 33 | * @return 调度任务日志对象信息 |
| 34 | */ | 34 | */ |
| 35 | - public SysJobLog selectJobLogById(Long jobLogId); | 35 | + SysJobLog selectJobLogById(Long jobLogId); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 新增任务日志 | 38 | * 新增任务日志 |
| @@ -40,7 +40,7 @@ public interface SysJobLogMapper | @@ -40,7 +40,7 @@ public interface SysJobLogMapper | ||
| 40 | * @param jobLog 调度日志信息 | 40 | * @param jobLog 调度日志信息 |
| 41 | * @return 结果 | 41 | * @return 结果 |
| 42 | */ | 42 | */ |
| 43 | - public int insertJobLog(SysJobLog jobLog); | 43 | + int insertJobLog(SysJobLog jobLog); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 批量删除调度日志信息 | 46 | * 批量删除调度日志信息 |
| @@ -48,7 +48,7 @@ public interface SysJobLogMapper | @@ -48,7 +48,7 @@ public interface SysJobLogMapper | ||
| 48 | * @param logIds 需要删除的数据ID | 48 | * @param logIds 需要删除的数据ID |
| 49 | * @return 结果 | 49 | * @return 结果 |
| 50 | */ | 50 | */ |
| 51 | - public int deleteJobLogByIds(Long[] logIds); | 51 | + int deleteJobLogByIds(Long[] logIds); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 删除任务日志 | 54 | * 删除任务日志 |
| @@ -56,10 +56,10 @@ public interface SysJobLogMapper | @@ -56,10 +56,10 @@ public interface SysJobLogMapper | ||
| 56 | * @param jobId 调度日志ID | 56 | * @param jobId 调度日志ID |
| 57 | * @return 结果 | 57 | * @return 结果 |
| 58 | */ | 58 | */ |
| 59 | - public int deleteJobLogById(Long jobId); | 59 | + int deleteJobLogById(Long jobId); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 清空任务日志 | 62 | * 清空任务日志 |
| 63 | */ | 63 | */ |
| 64 | - public void cleanJobLog(); | 64 | + void cleanJobLog(); |
| 65 | } | 65 | } |
trash-quartz/src/main/java/com/trash/quartz/mapper/SysJobMapper.java
| @@ -17,14 +17,14 @@ public interface SysJobMapper | @@ -17,14 +17,14 @@ public interface SysJobMapper | ||
| 17 | * @param job 调度信息 | 17 | * @param job 调度信息 |
| 18 | * @return 操作日志集合 | 18 | * @return 操作日志集合 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysJob> selectJobList(SysJob job); | 20 | + List<SysJob> selectJobList(SysJob job); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询所有调度任务 | 23 | * 查询所有调度任务 |
| 24 | * | 24 | * |
| 25 | * @return 调度任务列表 | 25 | * @return 调度任务列表 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysJob> selectJobAll(); | 27 | + List<SysJob> selectJobAll(); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 通过调度ID查询调度任务信息 | 30 | * 通过调度ID查询调度任务信息 |
| @@ -32,7 +32,7 @@ public interface SysJobMapper | @@ -32,7 +32,7 @@ public interface SysJobMapper | ||
| 32 | * @param jobId 调度ID | 32 | * @param jobId 调度ID |
| 33 | * @return 角色对象信息 | 33 | * @return 角色对象信息 |
| 34 | */ | 34 | */ |
| 35 | - public SysJob selectJobById(Long jobId); | 35 | + SysJob selectJobById(Long jobId); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 通过调度ID删除调度任务信息 | 38 | * 通过调度ID删除调度任务信息 |
| @@ -40,7 +40,7 @@ public interface SysJobMapper | @@ -40,7 +40,7 @@ public interface SysJobMapper | ||
| 40 | * @param jobId 调度ID | 40 | * @param jobId 调度ID |
| 41 | * @return 结果 | 41 | * @return 结果 |
| 42 | */ | 42 | */ |
| 43 | - public int deleteJobById(Long jobId); | 43 | + int deleteJobById(Long jobId); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 批量删除调度任务信息 | 46 | * 批量删除调度任务信息 |
| @@ -48,7 +48,7 @@ public interface SysJobMapper | @@ -48,7 +48,7 @@ public interface SysJobMapper | ||
| 48 | * @param ids 需要删除的数据ID | 48 | * @param ids 需要删除的数据ID |
| 49 | * @return 结果 | 49 | * @return 结果 |
| 50 | */ | 50 | */ |
| 51 | - public int deleteJobByIds(Long[] ids); | 51 | + int deleteJobByIds(Long[] ids); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 修改调度任务信息 | 54 | * 修改调度任务信息 |
| @@ -56,7 +56,7 @@ public interface SysJobMapper | @@ -56,7 +56,7 @@ public interface SysJobMapper | ||
| 56 | * @param job 调度任务信息 | 56 | * @param job 调度任务信息 |
| 57 | * @return 结果 | 57 | * @return 结果 |
| 58 | */ | 58 | */ |
| 59 | - public int updateJob(SysJob job); | 59 | + int updateJob(SysJob job); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 新增调度任务信息 | 62 | * 新增调度任务信息 |
| @@ -64,5 +64,5 @@ public interface SysJobMapper | @@ -64,5 +64,5 @@ public interface SysJobMapper | ||
| 64 | * @param job 调度任务信息 | 64 | * @param job 调度任务信息 |
| 65 | * @return 结果 | 65 | * @return 结果 |
| 66 | */ | 66 | */ |
| 67 | - public int insertJob(SysJob job); | 67 | + int insertJob(SysJob job); |
| 68 | } | 68 | } |
trash-quartz/src/main/java/com/trash/quartz/service/ISysJobLogService.java
| @@ -17,7 +17,7 @@ public interface ISysJobLogService | @@ -17,7 +17,7 @@ public interface ISysJobLogService | ||
| 17 | * @param jobLog 调度日志信息 | 17 | * @param jobLog 调度日志信息 |
| 18 | * @return 调度任务日志集合 | 18 | * @return 调度任务日志集合 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysJobLog> selectJobLogList(SysJobLog jobLog); | 20 | + List<SysJobLog> selectJobLogList(SysJobLog jobLog); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 通过调度任务日志ID查询调度信息 | 23 | * 通过调度任务日志ID查询调度信息 |
| @@ -25,14 +25,14 @@ public interface ISysJobLogService | @@ -25,14 +25,14 @@ public interface ISysJobLogService | ||
| 25 | * @param jobLogId 调度任务日志ID | 25 | * @param jobLogId 调度任务日志ID |
| 26 | * @return 调度任务日志对象信息 | 26 | * @return 调度任务日志对象信息 |
| 27 | */ | 27 | */ |
| 28 | - public SysJobLog selectJobLogById(Long jobLogId); | 28 | + SysJobLog selectJobLogById(Long jobLogId); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增任务日志 | 31 | * 新增任务日志 |
| 32 | * | 32 | * |
| 33 | * @param jobLog 调度日志信息 | 33 | * @param jobLog 调度日志信息 |
| 34 | */ | 34 | */ |
| 35 | - public void addJobLog(SysJobLog jobLog); | 35 | + void addJobLog(SysJobLog jobLog); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 批量删除调度日志信息 | 38 | * 批量删除调度日志信息 |
| @@ -40,7 +40,7 @@ public interface ISysJobLogService | @@ -40,7 +40,7 @@ public interface ISysJobLogService | ||
| 40 | * @param logIds 需要删除的日志ID | 40 | * @param logIds 需要删除的日志ID |
| 41 | * @return 结果 | 41 | * @return 结果 |
| 42 | */ | 42 | */ |
| 43 | - public int deleteJobLogByIds(Long[] logIds); | 43 | + int deleteJobLogByIds(Long[] logIds); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 删除任务日志 | 46 | * 删除任务日志 |
| @@ -48,10 +48,10 @@ public interface ISysJobLogService | @@ -48,10 +48,10 @@ public interface ISysJobLogService | ||
| 48 | * @param jobId 调度日志ID | 48 | * @param jobId 调度日志ID |
| 49 | * @return 结果 | 49 | * @return 结果 |
| 50 | */ | 50 | */ |
| 51 | - public int deleteJobLogById(Long jobId); | 51 | + int deleteJobLogById(Long jobId); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 清空任务日志 | 54 | * 清空任务日志 |
| 55 | */ | 55 | */ |
| 56 | - public void cleanJobLog(); | 56 | + void cleanJobLog(); |
| 57 | } | 57 | } |
trash-quartz/src/main/java/com/trash/quartz/service/ISysJobService.java
| @@ -19,7 +19,7 @@ public interface ISysJobService | @@ -19,7 +19,7 @@ public interface ISysJobService | ||
| 19 | * @param job 调度信息 | 19 | * @param job 调度信息 |
| 20 | * @return 调度任务集合 | 20 | * @return 调度任务集合 |
| 21 | */ | 21 | */ |
| 22 | - public List<SysJob> selectJobList(SysJob job); | 22 | + List<SysJob> selectJobList(SysJob job); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 通过调度任务ID查询调度信息 | 25 | * 通过调度任务ID查询调度信息 |
| @@ -27,7 +27,7 @@ public interface ISysJobService | @@ -27,7 +27,7 @@ public interface ISysJobService | ||
| 27 | * @param jobId 调度任务ID | 27 | * @param jobId 调度任务ID |
| 28 | * @return 调度任务对象信息 | 28 | * @return 调度任务对象信息 |
| 29 | */ | 29 | */ |
| 30 | - public SysJob selectJobById(Long jobId); | 30 | + SysJob selectJobById(Long jobId); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 暂停任务 | 33 | * 暂停任务 |
| @@ -35,7 +35,7 @@ public interface ISysJobService | @@ -35,7 +35,7 @@ public interface ISysJobService | ||
| 35 | * @param job 调度信息 | 35 | * @param job 调度信息 |
| 36 | * @return 结果 | 36 | * @return 结果 |
| 37 | */ | 37 | */ |
| 38 | - public int pauseJob(SysJob job) throws SchedulerException; | 38 | + int pauseJob(SysJob job) throws SchedulerException; |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 恢复任务 | 41 | * 恢复任务 |
| @@ -43,7 +43,7 @@ public interface ISysJobService | @@ -43,7 +43,7 @@ public interface ISysJobService | ||
| 43 | * @param job 调度信息 | 43 | * @param job 调度信息 |
| 44 | * @return 结果 | 44 | * @return 结果 |
| 45 | */ | 45 | */ |
| 46 | - public int resumeJob(SysJob job) throws SchedulerException; | 46 | + int resumeJob(SysJob job) throws SchedulerException; |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 删除任务后，所对应的trigger也将被删除 | 49 | * 删除任务后，所对应的trigger也将被删除 |
| @@ -51,7 +51,7 @@ public interface ISysJobService | @@ -51,7 +51,7 @@ public interface ISysJobService | ||
| 51 | * @param job 调度信息 | 51 | * @param job 调度信息 |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int deleteJob(SysJob job) throws SchedulerException; | 54 | + int deleteJob(SysJob job) throws SchedulerException; |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 批量删除调度信息 | 57 | * 批量删除调度信息 |
| @@ -59,7 +59,7 @@ public interface ISysJobService | @@ -59,7 +59,7 @@ public interface ISysJobService | ||
| 59 | * @param jobIds 需要删除的任务ID | 59 | * @param jobIds 需要删除的任务ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public void deleteJobByIds(Long[] jobIds) throws SchedulerException; | 62 | + void deleteJobByIds(Long[] jobIds) throws SchedulerException; |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * 任务调度状态修改 | 65 | * 任务调度状态修改 |
| @@ -67,7 +67,7 @@ public interface ISysJobService | @@ -67,7 +67,7 @@ public interface ISysJobService | ||
| 67 | * @param job 调度信息 | 67 | * @param job 调度信息 |
| 68 | * @return 结果 | 68 | * @return 结果 |
| 69 | */ | 69 | */ |
| 70 | - public int changeStatus(SysJob job) throws SchedulerException; | 70 | + int changeStatus(SysJob job) throws SchedulerException; |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * 立即运行任务 | 73 | * 立即运行任务 |
| @@ -75,7 +75,7 @@ public interface ISysJobService | @@ -75,7 +75,7 @@ public interface ISysJobService | ||
| 75 | * @param job 调度信息 | 75 | * @param job 调度信息 |
| 76 | * @return 结果 | 76 | * @return 结果 |
| 77 | */ | 77 | */ |
| 78 | - public void run(SysJob job) throws SchedulerException; | 78 | + void run(SysJob job) throws SchedulerException; |
| 79 | 79 | ||
| 80 | /** | 80 | /** |
| 81 | * 新增任务 | 81 | * 新增任务 |
| @@ -83,7 +83,7 @@ public interface ISysJobService | @@ -83,7 +83,7 @@ public interface ISysJobService | ||
| 83 | * @param job 调度信息 | 83 | * @param job 调度信息 |
| 84 | * @return 结果 | 84 | * @return 结果 |
| 85 | */ | 85 | */ |
| 86 | - public int insertJob(SysJob job) throws SchedulerException, TaskException; | 86 | + int insertJob(SysJob job) throws SchedulerException, TaskException; |
| 87 | 87 | ||
| 88 | /** | 88 | /** |
| 89 | * 更新任务 | 89 | * 更新任务 |
| @@ -91,7 +91,7 @@ public interface ISysJobService | @@ -91,7 +91,7 @@ public interface ISysJobService | ||
| 91 | * @param job 调度信息 | 91 | * @param job 调度信息 |
| 92 | * @return 结果 | 92 | * @return 结果 |
| 93 | */ | 93 | */ |
| 94 | - public int updateJob(SysJob job) throws SchedulerException, TaskException; | 94 | + int updateJob(SysJob job) throws SchedulerException, TaskException; |
| 95 | 95 | ||
| 96 | /** | 96 | /** |
| 97 | * 校验cron表达式是否有效 | 97 | * 校验cron表达式是否有效 |
| @@ -99,5 +99,5 @@ public interface ISysJobService | @@ -99,5 +99,5 @@ public interface ISysJobService | ||
| 99 | * @param cronExpression 表达式 | 99 | * @param cronExpression 表达式 |
| 100 | * @return 结果 | 100 | * @return 结果 |
| 101 | */ | 101 | */ |
| 102 | - public boolean checkCronExpressionIsValid(String cronExpression); | 102 | + boolean checkCronExpressionIsValid(String cronExpression); |
| 103 | } | 103 | } |
trash-quartz/src/main/java/com/trash/quartz/util/AbstractQuartzJob.java
| @@ -29,7 +29,7 @@ public abstract class AbstractQuartzJob implements Job | @@ -29,7 +29,7 @@ public abstract class AbstractQuartzJob implements Job | ||
| 29 | /** | 29 | /** |
| 30 | * 线程本地变量 | 30 | * 线程本地变量 |
| 31 | */ | 31 | */ |
| 32 | - private static ThreadLocal<Date> threadLocal = new ThreadLocal<>(); | 32 | + private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>(); |
| 33 | 33 | ||
| 34 | @Override | 34 | @Override |
| 35 | public void execute(JobExecutionContext context) throws JobExecutionException | 35 | public void execute(JobExecutionContext context) throws JobExecutionException |
trash-quartz/src/main/java/com/trash/quartz/util/JobInvokeUtil.java
| @@ -175,7 +175,7 @@ public class JobInvokeUtil | @@ -175,7 +175,7 @@ public class JobInvokeUtil | ||
| 175 | int index = 0; | 175 | int index = 0; |
| 176 | for (Object[] os : methodParams) | 176 | for (Object[] os : methodParams) |
| 177 | { | 177 | { |
| 178 | - classs[index] = (Object) os[0]; | 178 | + classs[index] = os[0]; |
| 179 | index++; | 179 | index++; |
| 180 | } | 180 | } |
| 181 | return classs; | 181 | return classs; |
trash-system/src/main/java/com/trash/system/mapper/SysConfigMapper.java
| @@ -17,7 +17,7 @@ public interface SysConfigMapper | @@ -17,7 +17,7 @@ public interface SysConfigMapper | ||
| 17 | * @param config 参数配置信息 | 17 | * @param config 参数配置信息 |
| 18 | * @return 参数配置信息 | 18 | * @return 参数配置信息 |
| 19 | */ | 19 | */ |
| 20 | - public SysConfig selectConfig(SysConfig config); | 20 | + SysConfig selectConfig(SysConfig config); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询参数配置列表 | 23 | * 查询参数配置列表 |
| @@ -25,7 +25,7 @@ public interface SysConfigMapper | @@ -25,7 +25,7 @@ public interface SysConfigMapper | ||
| 25 | * @param config 参数配置信息 | 25 | * @param config 参数配置信息 |
| 26 | * @return 参数配置集合 | 26 | * @return 参数配置集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysConfig> selectConfigList(SysConfig config); | 28 | + List<SysConfig> selectConfigList(SysConfig config); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 根据键名查询参数配置信息 | 31 | * 根据键名查询参数配置信息 |
| @@ -33,7 +33,7 @@ public interface SysConfigMapper | @@ -33,7 +33,7 @@ public interface SysConfigMapper | ||
| 33 | * @param configKey 参数键名 | 33 | * @param configKey 参数键名 |
| 34 | * @return 参数配置信息 | 34 | * @return 参数配置信息 |
| 35 | */ | 35 | */ |
| 36 | - public SysConfig checkConfigKeyUnique(String configKey); | 36 | + SysConfig checkConfigKeyUnique(String configKey); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 新增参数配置 | 39 | * 新增参数配置 |
| @@ -41,7 +41,7 @@ public interface SysConfigMapper | @@ -41,7 +41,7 @@ public interface SysConfigMapper | ||
| 41 | * @param config 参数配置信息 | 41 | * @param config 参数配置信息 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int insertConfig(SysConfig config); | 44 | + int insertConfig(SysConfig config); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 修改参数配置 | 47 | * 修改参数配置 |
| @@ -49,7 +49,7 @@ public interface SysConfigMapper | @@ -49,7 +49,7 @@ public interface SysConfigMapper | ||
| 49 | * @param config 参数配置信息 | 49 | * @param config 参数配置信息 |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int updateConfig(SysConfig config); | 52 | + int updateConfig(SysConfig config); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 删除参数配置 | 55 | * 删除参数配置 |
| @@ -57,7 +57,7 @@ public interface SysConfigMapper | @@ -57,7 +57,7 @@ public interface SysConfigMapper | ||
| 57 | * @param configId 参数ID | 57 | * @param configId 参数ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteConfigById(Long configId); | 60 | + int deleteConfigById(Long configId); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 批量删除参数信息 | 63 | * 批量删除参数信息 |
| @@ -65,5 +65,5 @@ public interface SysConfigMapper | @@ -65,5 +65,5 @@ public interface SysConfigMapper | ||
| 65 | * @param configIds 需要删除的参数ID | 65 | * @param configIds 需要删除的参数ID |
| 66 | * @return 结果 | 66 | * @return 结果 |
| 67 | */ | 67 | */ |
| 68 | - public int deleteConfigByIds(Long[] configIds); | 68 | + int deleteConfigByIds(Long[] configIds); |
| 69 | } | 69 | } |
trash-system/src/main/java/com/trash/system/mapper/SysDeptMapper.java
| @@ -18,7 +18,7 @@ public interface SysDeptMapper | @@ -18,7 +18,7 @@ public interface SysDeptMapper | ||
| 18 | * @param dept 部门信息 | 18 | * @param dept 部门信息 |
| 19 | * @return 部门信息集合 | 19 | * @return 部门信息集合 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysDept> selectDeptList(SysDept dept); | 21 | + List<SysDept> selectDeptList(SysDept dept); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 根据角色ID查询部门树信息 | 24 | * 根据角色ID查询部门树信息 |
| @@ -27,7 +27,7 @@ public interface SysDeptMapper | @@ -27,7 +27,7 @@ public interface SysDeptMapper | ||
| 27 | * @param deptCheckStrictly 部门树选择项是否关联显示 | 27 | * @param deptCheckStrictly 部门树选择项是否关联显示 |
| 28 | * @return 选中部门列表 | 28 | * @return 选中部门列表 |
| 29 | */ | 29 | */ |
| 30 | - public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); | 30 | + List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 根据部门ID查询信息 | 33 | * 根据部门ID查询信息 |
| @@ -35,7 +35,7 @@ public interface SysDeptMapper | @@ -35,7 +35,7 @@ public interface SysDeptMapper | ||
| 35 | * @param deptId 部门ID | 35 | * @param deptId 部门ID |
| 36 | * @return 部门信息 | 36 | * @return 部门信息 |
| 37 | */ | 37 | */ |
| 38 | - public SysDept selectDeptById(Long deptId); | 38 | + SysDept selectDeptById(Long deptId); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 根据ID查询所有子部门 | 41 | * 根据ID查询所有子部门 |
| @@ -43,7 +43,7 @@ public interface SysDeptMapper | @@ -43,7 +43,7 @@ public interface SysDeptMapper | ||
| 43 | * @param deptId 部门ID | 43 | * @param deptId 部门ID |
| 44 | * @return 部门列表 | 44 | * @return 部门列表 |
| 45 | */ | 45 | */ |
| 46 | - public List<SysDept> selectChildrenDeptById(Long deptId); | 46 | + List<SysDept> selectChildrenDeptById(Long deptId); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 根据ID查询所有子部门（正常状态） | 49 | * 根据ID查询所有子部门（正常状态） |
| @@ -51,7 +51,7 @@ public interface SysDeptMapper | @@ -51,7 +51,7 @@ public interface SysDeptMapper | ||
| 51 | * @param deptId 部门ID | 51 | * @param deptId 部门ID |
| 52 | * @return 子部门数 | 52 | * @return 子部门数 |
| 53 | */ | 53 | */ |
| 54 | - public int selectNormalChildrenDeptById(Long deptId); | 54 | + int selectNormalChildrenDeptById(Long deptId); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 是否存在子节点 | 57 | * 是否存在子节点 |
| @@ -59,7 +59,7 @@ public interface SysDeptMapper | @@ -59,7 +59,7 @@ public interface SysDeptMapper | ||
| 59 | * @param deptId 部门ID | 59 | * @param deptId 部门ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int hasChildByDeptId(Long deptId); | 62 | + int hasChildByDeptId(Long deptId); |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * 查询部门是否存在用户 | 65 | * 查询部门是否存在用户 |
| @@ -67,7 +67,7 @@ public interface SysDeptMapper | @@ -67,7 +67,7 @@ public interface SysDeptMapper | ||
| 67 | * @param deptId 部门ID | 67 | * @param deptId 部门ID |
| 68 | * @return 结果 | 68 | * @return 结果 |
| 69 | */ | 69 | */ |
| 70 | - public int checkDeptExistUser(Long deptId); | 70 | + int checkDeptExistUser(Long deptId); |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * 校验部门名称是否唯一 | 73 | * 校验部门名称是否唯一 |
| @@ -76,7 +76,7 @@ public interface SysDeptMapper | @@ -76,7 +76,7 @@ public interface SysDeptMapper | ||
| 76 | * @param parentId 父部门ID | 76 | * @param parentId 父部门ID |
| 77 | * @return 结果 | 77 | * @return 结果 |
| 78 | */ | 78 | */ |
| 79 | - public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); | 79 | + SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); |
| 80 | 80 | ||
| 81 | /** | 81 | /** |
| 82 | * 新增部门信息 | 82 | * 新增部门信息 |
| @@ -84,7 +84,7 @@ public interface SysDeptMapper | @@ -84,7 +84,7 @@ public interface SysDeptMapper | ||
| 84 | * @param dept 部门信息 | 84 | * @param dept 部门信息 |
| 85 | * @return 结果 | 85 | * @return 结果 |
| 86 | */ | 86 | */ |
| 87 | - public int insertDept(SysDept dept); | 87 | + int insertDept(SysDept dept); |
| 88 | 88 | ||
| 89 | /** | 89 | /** |
| 90 | * 修改部门信息 | 90 | * 修改部门信息 |
| @@ -92,14 +92,14 @@ public interface SysDeptMapper | @@ -92,14 +92,14 @@ public interface SysDeptMapper | ||
| 92 | * @param dept 部门信息 | 92 | * @param dept 部门信息 |
| 93 | * @return 结果 | 93 | * @return 结果 |
| 94 | */ | 94 | */ |
| 95 | - public int updateDept(SysDept dept); | 95 | + int updateDept(SysDept dept); |
| 96 | 96 | ||
| 97 | /** | 97 | /** |
| 98 | * 修改所在部门的父级部门状态 | 98 | * 修改所在部门的父级部门状态 |
| 99 | * | 99 | * |
| 100 | * @param dept 部门 | 100 | * @param dept 部门 |
| 101 | */ | 101 | */ |
| 102 | - public void updateDeptStatus(SysDept dept); | 102 | + void updateDeptStatus(SysDept dept); |
| 103 | 103 | ||
| 104 | /** | 104 | /** |
| 105 | * 修改子元素关系 | 105 | * 修改子元素关系 |
| @@ -107,7 +107,7 @@ public interface SysDeptMapper | @@ -107,7 +107,7 @@ public interface SysDeptMapper | ||
| 107 | * @param depts 子元素 | 107 | * @param depts 子元素 |
| 108 | * @return 结果 | 108 | * @return 结果 |
| 109 | */ | 109 | */ |
| 110 | - public int updateDeptChildren(@Param("depts") List<SysDept> depts); | 110 | + int updateDeptChildren(@Param("depts") List<SysDept> depts); |
| 111 | 111 | ||
| 112 | /** | 112 | /** |
| 113 | * 删除部门管理信息 | 113 | * 删除部门管理信息 |
| @@ -115,5 +115,5 @@ public interface SysDeptMapper | @@ -115,5 +115,5 @@ public interface SysDeptMapper | ||
| 115 | * @param deptId 部门ID | 115 | * @param deptId 部门ID |
| 116 | * @return 结果 | 116 | * @return 结果 |
| 117 | */ | 117 | */ |
| 118 | - public int deleteDeptById(Long deptId); | 118 | + int deleteDeptById(Long deptId); |
| 119 | } | 119 | } |
trash-system/src/main/java/com/trash/system/mapper/SysDictDataMapper.java
| @@ -18,7 +18,7 @@ public interface SysDictDataMapper | @@ -18,7 +18,7 @@ public interface SysDictDataMapper | ||
| 18 | * @param dictData 字典数据信息 | 18 | * @param dictData 字典数据信息 |
| 19 | * @return 字典数据集合信息 | 19 | * @return 字典数据集合信息 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysDictData> selectDictDataList(SysDictData dictData); | 21 | + List<SysDictData> selectDictDataList(SysDictData dictData); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 根据字典类型查询字典数据 | 24 | * 根据字典类型查询字典数据 |
| @@ -26,7 +26,7 @@ public interface SysDictDataMapper | @@ -26,7 +26,7 @@ public interface SysDictDataMapper | ||
| 26 | * @param dictType 字典类型 | 26 | * @param dictType 字典类型 |
| 27 | * @return 字典数据集合信息 | 27 | * @return 字典数据集合信息 |
| 28 | */ | 28 | */ |
| 29 | - public List<SysDictData> selectDictDataByType(String dictType); | 29 | + List<SysDictData> selectDictDataByType(String dictType); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 根据字典类型和字典键值查询字典数据信息 | 32 | * 根据字典类型和字典键值查询字典数据信息 |
| @@ -35,7 +35,7 @@ public interface SysDictDataMapper | @@ -35,7 +35,7 @@ public interface SysDictDataMapper | ||
| 35 | * @param dictValue 字典键值 | 35 | * @param dictValue 字典键值 |
| 36 | * @return 字典标签 | 36 | * @return 字典标签 |
| 37 | */ | 37 | */ |
| 38 | - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); | 38 | + String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 根据字典数据ID查询信息 | 41 | * 根据字典数据ID查询信息 |
| @@ -43,7 +43,7 @@ public interface SysDictDataMapper | @@ -43,7 +43,7 @@ public interface SysDictDataMapper | ||
| 43 | * @param dictCode 字典数据ID | 43 | * @param dictCode 字典数据ID |
| 44 | * @return 字典数据 | 44 | * @return 字典数据 |
| 45 | */ | 45 | */ |
| 46 | - public SysDictData selectDictDataById(Long dictCode); | 46 | + SysDictData selectDictDataById(Long dictCode); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 查询字典数据 | 49 | * 查询字典数据 |
| @@ -51,7 +51,7 @@ public interface SysDictDataMapper | @@ -51,7 +51,7 @@ public interface SysDictDataMapper | ||
| 51 | * @param dictType 字典类型 | 51 | * @param dictType 字典类型 |
| 52 | * @return 字典数据 | 52 | * @return 字典数据 |
| 53 | */ | 53 | */ |
| 54 | - public int countDictDataByType(String dictType); | 54 | + int countDictDataByType(String dictType); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 通过字典ID删除字典数据信息 | 57 | * 通过字典ID删除字典数据信息 |
| @@ -59,7 +59,7 @@ public interface SysDictDataMapper | @@ -59,7 +59,7 @@ public interface SysDictDataMapper | ||
| 59 | * @param dictCode 字典数据ID | 59 | * @param dictCode 字典数据ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteDictDataById(Long dictCode); | 62 | + int deleteDictDataById(Long dictCode); |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * 批量删除字典数据信息 | 65 | * 批量删除字典数据信息 |
| @@ -67,7 +67,7 @@ public interface SysDictDataMapper | @@ -67,7 +67,7 @@ public interface SysDictDataMapper | ||
| 67 | * @param dictCodes 需要删除的字典数据ID | 67 | * @param dictCodes 需要删除的字典数据ID |
| 68 | * @return 结果 | 68 | * @return 结果 |
| 69 | */ | 69 | */ |
| 70 | - public int deleteDictDataByIds(Long[] dictCodes); | 70 | + int deleteDictDataByIds(Long[] dictCodes); |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * 新增字典数据信息 | 73 | * 新增字典数据信息 |
| @@ -75,7 +75,7 @@ public interface SysDictDataMapper | @@ -75,7 +75,7 @@ public interface SysDictDataMapper | ||
| 75 | * @param dictData 字典数据信息 | 75 | * @param dictData 字典数据信息 |
| 76 | * @return 结果 | 76 | * @return 结果 |
| 77 | */ | 77 | */ |
| 78 | - public int insertDictData(SysDictData dictData); | 78 | + int insertDictData(SysDictData dictData); |
| 79 | 79 | ||
| 80 | /** | 80 | /** |
| 81 | * 修改字典数据信息 | 81 | * 修改字典数据信息 |
| @@ -83,7 +83,7 @@ public interface SysDictDataMapper | @@ -83,7 +83,7 @@ public interface SysDictDataMapper | ||
| 83 | * @param dictData 字典数据信息 | 83 | * @param dictData 字典数据信息 |
| 84 | * @return 结果 | 84 | * @return 结果 |
| 85 | */ | 85 | */ |
| 86 | - public int updateDictData(SysDictData dictData); | 86 | + int updateDictData(SysDictData dictData); |
| 87 | 87 | ||
| 88 | /** | 88 | /** |
| 89 | * 同步修改字典类型 | 89 | * 同步修改字典类型 |
| @@ -92,5 +92,5 @@ public interface SysDictDataMapper | @@ -92,5 +92,5 @@ public interface SysDictDataMapper | ||
| 92 | * @param newDictType 新旧字典类型 | 92 | * @param newDictType 新旧字典类型 |
| 93 | * @return 结果 | 93 | * @return 结果 |
| 94 | */ | 94 | */ |
| 95 | - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); | 95 | + int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); |
| 96 | } | 96 | } |
trash-system/src/main/java/com/trash/system/mapper/SysDictTypeMapper.java
| @@ -19,14 +19,14 @@ public interface SysDictTypeMapper | @@ -19,14 +19,14 @@ public interface SysDictTypeMapper | ||
| 19 | * @param dictType 字典类型信息 | 19 | * @param dictType 字典类型信息 |
| 20 | * @return 字典类型集合信息 | 20 | * @return 字典类型集合信息 |
| 21 | */ | 21 | */ |
| 22 | - public List<SysDictType> selectDictTypeList(SysDictType dictType); | 22 | + List<SysDictType> selectDictTypeList(SysDictType dictType); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 根据所有字典类型 | 25 | * 根据所有字典类型 |
| 26 | * | 26 | * |
| 27 | * @return 字典类型集合信息 | 27 | * @return 字典类型集合信息 |
| 28 | */ | 28 | */ |
| 29 | - public List<SysDictType> selectDictTypeAll(); | 29 | + List<SysDictType> selectDictTypeAll(); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 根据字典类型ID查询信息 | 32 | * 根据字典类型ID查询信息 |
| @@ -34,7 +34,7 @@ public interface SysDictTypeMapper | @@ -34,7 +34,7 @@ public interface SysDictTypeMapper | ||
| 34 | * @param dictId 字典类型ID | 34 | * @param dictId 字典类型ID |
| 35 | * @return 字典类型 | 35 | * @return 字典类型 |
| 36 | */ | 36 | */ |
| 37 | - public SysDictType selectDictTypeById(Long dictId); | 37 | + SysDictType selectDictTypeById(Long dictId); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 根据字典类型查询信息 | 40 | * 根据字典类型查询信息 |
| @@ -42,7 +42,7 @@ public interface SysDictTypeMapper | @@ -42,7 +42,7 @@ public interface SysDictTypeMapper | ||
| 42 | * @param dictType 字典类型 | 42 | * @param dictType 字典类型 |
| 43 | * @return 字典类型 | 43 | * @return 字典类型 |
| 44 | */ | 44 | */ |
| 45 | - public SysDictType selectDictTypeByType(String dictType); | 45 | + SysDictType selectDictTypeByType(String dictType); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 通过字典ID删除字典信息 | 48 | * 通过字典ID删除字典信息 |
| @@ -50,7 +50,7 @@ public interface SysDictTypeMapper | @@ -50,7 +50,7 @@ public interface SysDictTypeMapper | ||
| 50 | * @param dictId 字典ID | 50 | * @param dictId 字典ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDictTypeById(Long dictId); | 53 | + int deleteDictTypeById(Long dictId); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除字典类型信息 | 56 | * 批量删除字典类型信息 |
| @@ -58,7 +58,7 @@ public interface SysDictTypeMapper | @@ -58,7 +58,7 @@ public interface SysDictTypeMapper | ||
| 58 | * @param dictIds 需要删除的字典ID | 58 | * @param dictIds 需要删除的字典ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDictTypeByIds(Long[] dictIds); | 61 | + int deleteDictTypeByIds(Long[] dictIds); |
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * 新增字典类型信息 | 64 | * 新增字典类型信息 |
| @@ -66,7 +66,7 @@ public interface SysDictTypeMapper | @@ -66,7 +66,7 @@ public interface SysDictTypeMapper | ||
| 66 | * @param dictType 字典类型信息 | 66 | * @param dictType 字典类型信息 |
| 67 | * @return 结果 | 67 | * @return 结果 |
| 68 | */ | 68 | */ |
| 69 | - public int insertDictType(SysDictType dictType); | 69 | + int insertDictType(SysDictType dictType); |
| 70 | 70 | ||
| 71 | /** | 71 | /** |
| 72 | * 修改字典类型信息 | 72 | * 修改字典类型信息 |
| @@ -74,7 +74,7 @@ public interface SysDictTypeMapper | @@ -74,7 +74,7 @@ public interface SysDictTypeMapper | ||
| 74 | * @param dictType 字典类型信息 | 74 | * @param dictType 字典类型信息 |
| 75 | * @return 结果 | 75 | * @return 结果 |
| 76 | */ | 76 | */ |
| 77 | - public int updateDictType(SysDictType dictType); | 77 | + int updateDictType(SysDictType dictType); |
| 78 | 78 | ||
| 79 | /** | 79 | /** |
| 80 | * 校验字典类型称是否唯一 | 80 | * 校验字典类型称是否唯一 |
| @@ -82,5 +82,5 @@ public interface SysDictTypeMapper | @@ -82,5 +82,5 @@ public interface SysDictTypeMapper | ||
| 82 | * @param dictType 字典类型 | 82 | * @param dictType 字典类型 |
| 83 | * @return 结果 | 83 | * @return 结果 |
| 84 | */ | 84 | */ |
| 85 | - public SysDictType checkDictTypeUnique(String dictType); | 85 | + SysDictType checkDictTypeUnique(String dictType); |
| 86 | } | 86 | } |
trash-system/src/main/java/com/trash/system/mapper/SysLogininforMapper.java
| @@ -16,7 +16,7 @@ public interface SysLogininforMapper | @@ -16,7 +16,7 @@ public interface SysLogininforMapper | ||
| 16 | * | 16 | * |
| 17 | * @param logininfor 访问日志对象 | 17 | * @param logininfor 访问日志对象 |
| 18 | */ | 18 | */ |
| 19 | - public void insertLogininfor(SysLogininfor logininfor); | 19 | + void insertLogininfor(SysLogininfor logininfor); |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * 查询系统登录日志集合 | 22 | * 查询系统登录日志集合 |
| @@ -24,7 +24,7 @@ public interface SysLogininforMapper | @@ -24,7 +24,7 @@ public interface SysLogininforMapper | ||
| 24 | * @param logininfor 访问日志对象 | 24 | * @param logininfor 访问日志对象 |
| 25 | * @return 登录记录集合 | 25 | * @return 登录记录集合 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor); | 27 | + List<SysLogininfor> selectLogininforList(SysLogininfor logininfor); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 批量删除系统登录日志 | 30 | * 批量删除系统登录日志 |
| @@ -32,12 +32,12 @@ public interface SysLogininforMapper | @@ -32,12 +32,12 @@ public interface SysLogininforMapper | ||
| 32 | * @param infoIds 需要删除的登录日志ID | 32 | * @param infoIds 需要删除的登录日志ID |
| 33 | * @return 结果 | 33 | * @return 结果 |
| 34 | */ | 34 | */ |
| 35 | - public int deleteLogininforByIds(Long[] infoIds); | 35 | + int deleteLogininforByIds(Long[] infoIds); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 清空系统登录日志 | 38 | * 清空系统登录日志 |
| 39 | * | 39 | * |
| 40 | * @return 结果 | 40 | * @return 结果 |
| 41 | */ | 41 | */ |
| 42 | - public int cleanLogininfor(); | 42 | + int cleanLogininfor(); |
| 43 | } | 43 | } |
trash-system/src/main/java/com/trash/system/mapper/SysMenuMapper.java
| @@ -18,14 +18,14 @@ public interface SysMenuMapper | @@ -18,14 +18,14 @@ public interface SysMenuMapper | ||
| 18 | * @param menu 菜单信息 | 18 | * @param menu 菜单信息 |
| 19 | * @return 菜单列表 | 19 | * @return 菜单列表 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysMenu> selectMenuList(SysMenu menu); | 21 | + List<SysMenu> selectMenuList(SysMenu menu); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 根据用户所有权限 | 24 | * 根据用户所有权限 |
| 25 | * | 25 | * |
| 26 | * @return 权限列表 | 26 | * @return 权限列表 |
| 27 | */ | 27 | */ |
| 28 | - public List<String> selectMenuPerms(); | 28 | + List<String> selectMenuPerms(); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 根据用户查询系统菜单列表 | 31 | * 根据用户查询系统菜单列表 |
| @@ -33,7 +33,7 @@ public interface SysMenuMapper | @@ -33,7 +33,7 @@ public interface SysMenuMapper | ||
| 33 | * @param menu 菜单信息 | 33 | * @param menu 菜单信息 |
| 34 | * @return 菜单列表 | 34 | * @return 菜单列表 |
| 35 | */ | 35 | */ |
| 36 | - public List<SysMenu> selectMenuListByUserId(SysMenu menu); | 36 | + List<SysMenu> selectMenuListByUserId(SysMenu menu); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据用户ID查询权限 | 39 | * 根据用户ID查询权限 |
| @@ -41,14 +41,14 @@ public interface SysMenuMapper | @@ -41,14 +41,14 @@ public interface SysMenuMapper | ||
| 41 | * @param userId 用户ID | 41 | * @param userId 用户ID |
| 42 | * @return 权限列表 | 42 | * @return 权限列表 |
| 43 | */ | 43 | */ |
| 44 | - public List<String> selectMenuPermsByUserId(String userId); | 44 | + List<String> selectMenuPermsByUserId(String userId); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 根据用户ID查询菜单 | 47 | * 根据用户ID查询菜单 |
| 48 | * | 48 | * |
| 49 | * @return 菜单列表 | 49 | * @return 菜单列表 |
| 50 | */ | 50 | */ |
| 51 | - public List<SysMenu> selectMenuTreeAll(); | 51 | + List<SysMenu> selectMenuTreeAll(); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 根据用户ID查询菜单 | 54 | * 根据用户ID查询菜单 |
| @@ -56,7 +56,7 @@ public interface SysMenuMapper | @@ -56,7 +56,7 @@ public interface SysMenuMapper | ||
| 56 | * @param userId 用户ID | 56 | * @param userId 用户ID |
| 57 | * @return 菜单列表 | 57 | * @return 菜单列表 |
| 58 | */ | 58 | */ |
| 59 | - public List<SysMenu> selectMenuTreeByUserId(String userId); | 59 | + List<SysMenu> selectMenuTreeByUserId(String userId); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 根据角色ID查询菜单树信息 | 62 | * 根据角色ID查询菜单树信息 |
| @@ -65,7 +65,7 @@ public interface SysMenuMapper | @@ -65,7 +65,7 @@ public interface SysMenuMapper | ||
| 65 | * @param menuCheckStrictly 菜单树选择项是否关联显示 | 65 | * @param menuCheckStrictly 菜单树选择项是否关联显示 |
| 66 | * @return 选中菜单列表 | 66 | * @return 选中菜单列表 |
| 67 | */ | 67 | */ |
| 68 | - public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); | 68 | + List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 根据菜单ID查询信息 | 71 | * 根据菜单ID查询信息 |
| @@ -73,7 +73,7 @@ public interface SysMenuMapper | @@ -73,7 +73,7 @@ public interface SysMenuMapper | ||
| 73 | * @param menuId 菜单ID | 73 | * @param menuId 菜单ID |
| 74 | * @return 菜单信息 | 74 | * @return 菜单信息 |
| 75 | */ | 75 | */ |
| 76 | - public SysMenu selectMenuById(Long menuId); | 76 | + SysMenu selectMenuById(Long menuId); |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * 是否存在菜单子节点 | 79 | * 是否存在菜单子节点 |
| @@ -81,7 +81,7 @@ public interface SysMenuMapper | @@ -81,7 +81,7 @@ public interface SysMenuMapper | ||
| 81 | * @param menuId 菜单ID | 81 | * @param menuId 菜单ID |
| 82 | * @return 结果 | 82 | * @return 结果 |
| 83 | */ | 83 | */ |
| 84 | - public int hasChildByMenuId(Long menuId); | 84 | + int hasChildByMenuId(Long menuId); |
| 85 | 85 | ||
| 86 | /** | 86 | /** |
| 87 | * 新增菜单信息 | 87 | * 新增菜单信息 |
| @@ -89,7 +89,7 @@ public interface SysMenuMapper | @@ -89,7 +89,7 @@ public interface SysMenuMapper | ||
| 89 | * @param menu 菜单信息 | 89 | * @param menu 菜单信息 |
| 90 | * @return 结果 | 90 | * @return 结果 |
| 91 | */ | 91 | */ |
| 92 | - public int insertMenu(SysMenu menu); | 92 | + int insertMenu(SysMenu menu); |
| 93 | 93 | ||
| 94 | /** | 94 | /** |
| 95 | * 修改菜单信息 | 95 | * 修改菜单信息 |
| @@ -97,7 +97,7 @@ public interface SysMenuMapper | @@ -97,7 +97,7 @@ public interface SysMenuMapper | ||
| 97 | * @param menu 菜单信息 | 97 | * @param menu 菜单信息 |
| 98 | * @return 结果 | 98 | * @return 结果 |
| 99 | */ | 99 | */ |
| 100 | - public int updateMenu(SysMenu menu); | 100 | + int updateMenu(SysMenu menu); |
| 101 | 101 | ||
| 102 | /** | 102 | /** |
| 103 | * 删除菜单管理信息 | 103 | * 删除菜单管理信息 |
| @@ -105,7 +105,7 @@ public interface SysMenuMapper | @@ -105,7 +105,7 @@ public interface SysMenuMapper | ||
| 105 | * @param menuId 菜单ID | 105 | * @param menuId 菜单ID |
| 106 | * @return 结果 | 106 | * @return 结果 |
| 107 | */ | 107 | */ |
| 108 | - public int deleteMenuById(Long menuId); | 108 | + int deleteMenuById(Long menuId); |
| 109 | 109 | ||
| 110 | /** | 110 | /** |
| 111 | * 校验菜单名称是否唯一 | 111 | * 校验菜单名称是否唯一 |
| @@ -114,5 +114,5 @@ public interface SysMenuMapper | @@ -114,5 +114,5 @@ public interface SysMenuMapper | ||
| 114 | * @param parentId 父菜单ID | 114 | * @param parentId 父菜单ID |
| 115 | * @return 结果 | 115 | * @return 结果 |
| 116 | */ | 116 | */ |
| 117 | - public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); | 117 | + SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); |
| 118 | } | 118 | } |
trash-system/src/main/java/com/trash/system/mapper/SysNoticeMapper.java
| @@ -17,7 +17,7 @@ public interface SysNoticeMapper | @@ -17,7 +17,7 @@ public interface SysNoticeMapper | ||
| 17 | * @param noticeId 公告ID | 17 | * @param noticeId 公告ID |
| 18 | * @return 公告信息 | 18 | * @return 公告信息 |
| 19 | */ | 19 | */ |
| 20 | - public SysNotice selectNoticeById(Long noticeId); | 20 | + SysNotice selectNoticeById(Long noticeId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询公告列表 | 23 | * 查询公告列表 |
| @@ -25,7 +25,7 @@ public interface SysNoticeMapper | @@ -25,7 +25,7 @@ public interface SysNoticeMapper | ||
| 25 | * @param notice 公告信息 | 25 | * @param notice 公告信息 |
| 26 | * @return 公告集合 | 26 | * @return 公告集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysNotice> selectNoticeList(SysNotice notice); | 28 | + List<SysNotice> selectNoticeList(SysNotice notice); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增公告 | 31 | * 新增公告 |
| @@ -33,7 +33,7 @@ public interface SysNoticeMapper | @@ -33,7 +33,7 @@ public interface SysNoticeMapper | ||
| 33 | * @param notice 公告信息 | 33 | * @param notice 公告信息 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertNotice(SysNotice notice); | 36 | + int insertNotice(SysNotice notice); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改公告 | 39 | * 修改公告 |
| @@ -41,7 +41,7 @@ public interface SysNoticeMapper | @@ -41,7 +41,7 @@ public interface SysNoticeMapper | ||
| 41 | * @param notice 公告信息 | 41 | * @param notice 公告信息 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateNotice(SysNotice notice); | 44 | + int updateNotice(SysNotice notice); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 批量删除公告 | 47 | * 批量删除公告 |
| @@ -49,7 +49,7 @@ public interface SysNoticeMapper | @@ -49,7 +49,7 @@ public interface SysNoticeMapper | ||
| 49 | * @param noticeId 公告ID | 49 | * @param noticeId 公告ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteNoticeById(Long noticeId); | 52 | + int deleteNoticeById(Long noticeId); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除公告信息 | 55 | * 批量删除公告信息 |
| @@ -57,5 +57,5 @@ public interface SysNoticeMapper | @@ -57,5 +57,5 @@ public interface SysNoticeMapper | ||
| 57 | * @param noticeIds 需要删除的公告ID | 57 | * @param noticeIds 需要删除的公告ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteNoticeByIds(Long[] noticeIds); | 60 | + int deleteNoticeByIds(Long[] noticeIds); |
| 61 | } | 61 | } |
trash-system/src/main/java/com/trash/system/mapper/SysOperLogMapper.java
| @@ -16,7 +16,7 @@ public interface SysOperLogMapper | @@ -16,7 +16,7 @@ public interface SysOperLogMapper | ||
| 16 | * | 16 | * |
| 17 | * @param operLog 操作日志对象 | 17 | * @param operLog 操作日志对象 |
| 18 | */ | 18 | */ |
| 19 | - public void insertOperlog(SysOperLog operLog); | 19 | + void insertOperlog(SysOperLog operLog); |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * 查询系统操作日志集合 | 22 | * 查询系统操作日志集合 |
| @@ -24,7 +24,7 @@ public interface SysOperLogMapper | @@ -24,7 +24,7 @@ public interface SysOperLogMapper | ||
| 24 | * @param operLog 操作日志对象 | 24 | * @param operLog 操作日志对象 |
| 25 | * @return 操作日志集合 | 25 | * @return 操作日志集合 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysOperLog> selectOperLogList(SysOperLog operLog); | 27 | + List<SysOperLog> selectOperLogList(SysOperLog operLog); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 批量删除系统操作日志 | 30 | * 批量删除系统操作日志 |
| @@ -32,7 +32,7 @@ public interface SysOperLogMapper | @@ -32,7 +32,7 @@ public interface SysOperLogMapper | ||
| 32 | * @param operIds 需要删除的操作日志ID | 32 | * @param operIds 需要删除的操作日志ID |
| 33 | * @return 结果 | 33 | * @return 结果 |
| 34 | */ | 34 | */ |
| 35 | - public int deleteOperLogByIds(Long[] operIds); | 35 | + int deleteOperLogByIds(Long[] operIds); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 查询操作日志详细 | 38 | * 查询操作日志详细 |
| @@ -40,10 +40,10 @@ public interface SysOperLogMapper | @@ -40,10 +40,10 @@ public interface SysOperLogMapper | ||
| 40 | * @param operId 操作ID | 40 | * @param operId 操作ID |
| 41 | * @return 操作日志对象 | 41 | * @return 操作日志对象 |
| 42 | */ | 42 | */ |
| 43 | - public SysOperLog selectOperLogById(Long operId); | 43 | + SysOperLog selectOperLogById(Long operId); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 清空操作日志 | 46 | * 清空操作日志 |
| 47 | */ | 47 | */ |
| 48 | - public void cleanOperLog(); | 48 | + void cleanOperLog(); |
| 49 | } | 49 | } |
trash-system/src/main/java/com/trash/system/mapper/SysPostMapper.java
| @@ -18,14 +18,14 @@ public interface SysPostMapper | @@ -18,14 +18,14 @@ public interface SysPostMapper | ||
| 18 | * @param post 岗位信息 | 18 | * @param post 岗位信息 |
| 19 | * @return 岗位数据集合 | 19 | * @return 岗位数据集合 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysPost> selectPostList(SysPost post); | 21 | + List<SysPost> selectPostList(SysPost post); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询所有岗位 | 24 | * 查询所有岗位 |
| 25 | * | 25 | * |
| 26 | * @return 岗位列表 | 26 | * @return 岗位列表 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysPost> selectPostAll(); | 28 | + List<SysPost> selectPostAll(); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 通过岗位ID查询岗位信息 | 31 | * 通过岗位ID查询岗位信息 |
| @@ -33,7 +33,7 @@ public interface SysPostMapper | @@ -33,7 +33,7 @@ public interface SysPostMapper | ||
| 33 | * @param postId 岗位ID | 33 | * @param postId 岗位ID |
| 34 | * @return 角色对象信息 | 34 | * @return 角色对象信息 |
| 35 | */ | 35 | */ |
| 36 | - public SysPost selectPostById(Long postId); | 36 | + SysPost selectPostById(Long postId); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据用户ID获取岗位选择框列表 | 39 | * 根据用户ID获取岗位选择框列表 |
| @@ -41,14 +41,14 @@ public interface SysPostMapper | @@ -41,14 +41,14 @@ public interface SysPostMapper | ||
| 41 | * @param userId 用户ID | 41 | * @param userId 用户ID |
| 42 | * @return 选中岗位ID列表 | 42 | * @return 选中岗位ID列表 |
| 43 | */ | 43 | */ |
| 44 | - public List<Integer> selectPostListByUserId(String userId); | 44 | + List<Integer> selectPostListByUserId(String userId); |
| 45 | /** | 45 | /** |
| 46 | * 根据用户ID获取PostCode | 46 | * 根据用户ID获取PostCode |
| 47 | * | 47 | * |
| 48 | * @param userId 用户ID | 48 | * @param userId 用户ID |
| 49 | * @return 选中岗位PostCode列表 | 49 | * @return 选中岗位PostCode列表 |
| 50 | */ | 50 | */ |
| 51 | - public Set<String> selectPostCodeByUserId(String userId); | 51 | + Set<String> selectPostCodeByUserId(String userId); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 查询用户所属岗位组 | 54 | * 查询用户所属岗位组 |
| @@ -56,7 +56,7 @@ public interface SysPostMapper | @@ -56,7 +56,7 @@ public interface SysPostMapper | ||
| 56 | * @param userName 用户名 | 56 | * @param userName 用户名 |
| 57 | * @return 结果 | 57 | * @return 结果 |
| 58 | */ | 58 | */ |
| 59 | - public List<SysPost> selectPostsByUserName(String userName); | 59 | + List<SysPost> selectPostsByUserName(String userName); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 删除岗位信息 | 62 | * 删除岗位信息 |
| @@ -64,7 +64,7 @@ public interface SysPostMapper | @@ -64,7 +64,7 @@ public interface SysPostMapper | ||
| 64 | * @param postId 岗位ID | 64 | * @param postId 岗位ID |
| 65 | * @return 结果 | 65 | * @return 结果 |
| 66 | */ | 66 | */ |
| 67 | - public int deletePostById(Long postId); | 67 | + int deletePostById(Long postId); |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * 批量删除岗位信息 | 70 | * 批量删除岗位信息 |
| @@ -72,7 +72,7 @@ public interface SysPostMapper | @@ -72,7 +72,7 @@ public interface SysPostMapper | ||
| 72 | * @param postIds 需要删除的岗位ID | 72 | * @param postIds 需要删除的岗位ID |
| 73 | * @return 结果 | 73 | * @return 结果 |
| 74 | */ | 74 | */ |
| 75 | - public int deletePostByIds(Long[] postIds); | 75 | + int deletePostByIds(Long[] postIds); |
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * 修改岗位信息 | 78 | * 修改岗位信息 |
| @@ -80,7 +80,7 @@ public interface SysPostMapper | @@ -80,7 +80,7 @@ public interface SysPostMapper | ||
| 80 | * @param post 岗位信息 | 80 | * @param post 岗位信息 |
| 81 | * @return 结果 | 81 | * @return 结果 |
| 82 | */ | 82 | */ |
| 83 | - public int updatePost(SysPost post); | 83 | + int updatePost(SysPost post); |
| 84 | 84 | ||
| 85 | /** | 85 | /** |
| 86 | * 新增岗位信息 | 86 | * 新增岗位信息 |
| @@ -88,7 +88,7 @@ public interface SysPostMapper | @@ -88,7 +88,7 @@ public interface SysPostMapper | ||
| 88 | * @param post 岗位信息 | 88 | * @param post 岗位信息 |
| 89 | * @return 结果 | 89 | * @return 结果 |
| 90 | */ | 90 | */ |
| 91 | - public int insertPost(SysPost post); | 91 | + int insertPost(SysPost post); |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * 校验岗位名称 | 94 | * 校验岗位名称 |
| @@ -96,7 +96,7 @@ public interface SysPostMapper | @@ -96,7 +96,7 @@ public interface SysPostMapper | ||
| 96 | * @param postName 岗位名称 | 96 | * @param postName 岗位名称 |
| 97 | * @return 结果 | 97 | * @return 结果 |
| 98 | */ | 98 | */ |
| 99 | - public SysPost checkPostNameUnique(String postName); | 99 | + SysPost checkPostNameUnique(String postName); |
| 100 | 100 | ||
| 101 | /** | 101 | /** |
| 102 | * 校验岗位编码 | 102 | * 校验岗位编码 |
| @@ -104,5 +104,5 @@ public interface SysPostMapper | @@ -104,5 +104,5 @@ public interface SysPostMapper | ||
| 104 | * @param postCode 岗位编码 | 104 | * @param postCode 岗位编码 |
| 105 | * @return 结果 | 105 | * @return 结果 |
| 106 | */ | 106 | */ |
| 107 | - public SysPost checkPostCodeUnique(String postCode); | 107 | + SysPost checkPostCodeUnique(String postCode); |
| 108 | } | 108 | } |
trash-system/src/main/java/com/trash/system/mapper/SysRoleDeptMapper.java
| @@ -17,7 +17,7 @@ public interface SysRoleDeptMapper | @@ -17,7 +17,7 @@ public interface SysRoleDeptMapper | ||
| 17 | * @param roleId 角色ID | 17 | * @param roleId 角色ID |
| 18 | * @return 结果 | 18 | * @return 结果 |
| 19 | */ | 19 | */ |
| 20 | - public int deleteRoleDeptByRoleId(Long roleId); | 20 | + int deleteRoleDeptByRoleId(Long roleId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 批量删除角色部门关联信息 | 23 | * 批量删除角色部门关联信息 |
| @@ -25,7 +25,7 @@ public interface SysRoleDeptMapper | @@ -25,7 +25,7 @@ public interface SysRoleDeptMapper | ||
| 25 | * @param ids 需要删除的数据ID | 25 | * @param ids 需要删除的数据ID |
| 26 | * @return 结果 | 26 | * @return 结果 |
| 27 | */ | 27 | */ |
| 28 | - public int deleteRoleDept(Long[] ids); | 28 | + int deleteRoleDept(Long[] ids); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 查询部门使用数量 | 31 | * 查询部门使用数量 |
| @@ -33,7 +33,7 @@ public interface SysRoleDeptMapper | @@ -33,7 +33,7 @@ public interface SysRoleDeptMapper | ||
| 33 | * @param deptId 部门ID | 33 | * @param deptId 部门ID |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int selectCountRoleDeptByDeptId(Long deptId); | 36 | + int selectCountRoleDeptByDeptId(Long deptId); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 批量新增角色部门信息 | 39 | * 批量新增角色部门信息 |
| @@ -41,5 +41,5 @@ public interface SysRoleDeptMapper | @@ -41,5 +41,5 @@ public interface SysRoleDeptMapper | ||
| 41 | * @param roleDeptList 角色部门列表 | 41 | * @param roleDeptList 角色部门列表 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int batchRoleDept(List<SysRoleDept> roleDeptList); | 44 | + int batchRoleDept(List<SysRoleDept> roleDeptList); |
| 45 | } | 45 | } |
trash-system/src/main/java/com/trash/system/mapper/SysRoleMapper.java
| @@ -17,7 +17,7 @@ public interface SysRoleMapper | @@ -17,7 +17,7 @@ public interface SysRoleMapper | ||
| 17 | * @param role 角色信息 | 17 | * @param role 角色信息 |
| 18 | * @return 角色数据集合信息 | 18 | * @return 角色数据集合信息 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysRole> selectRoleList(SysRole role); | 20 | + List<SysRole> selectRoleList(SysRole role); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 根据用户ID查询角色 | 23 | * 根据用户ID查询角色 |
| @@ -25,14 +25,14 @@ public interface SysRoleMapper | @@ -25,14 +25,14 @@ public interface SysRoleMapper | ||
| 25 | * @param userId 用户ID | 25 | * @param userId 用户ID |
| 26 | * @return 角色列表 | 26 | * @return 角色列表 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysRole> selectRolePermissionByUserId(String userId); | 28 | + List<SysRole> selectRolePermissionByUserId(String userId); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 查询所有角色 | 31 | * 查询所有角色 |
| 32 | * | 32 | * |
| 33 | * @return 角色列表 | 33 | * @return 角色列表 |
| 34 | */ | 34 | */ |
| 35 | - public List<SysRole> selectRoleAll(); | 35 | + List<SysRole> selectRoleAll(); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 根据用户ID获取角色选择框列表 | 38 | * 根据用户ID获取角色选择框列表 |
| @@ -40,7 +40,7 @@ public interface SysRoleMapper | @@ -40,7 +40,7 @@ public interface SysRoleMapper | ||
| 40 | * @param userId 用户ID | 40 | * @param userId 用户ID |
| 41 | * @return 选中角色ID列表 | 41 | * @return 选中角色ID列表 |
| 42 | */ | 42 | */ |
| 43 | - public List<Integer> selectRoleListByUserId(String userId); | 43 | + List<Integer> selectRoleListByUserId(String userId); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 通过角色ID查询角色 | 46 | * 通过角色ID查询角色 |
| @@ -48,7 +48,7 @@ public interface SysRoleMapper | @@ -48,7 +48,7 @@ public interface SysRoleMapper | ||
| 48 | * @param roleId 角色ID | 48 | * @param roleId 角色ID |
| 49 | * @return 角色对象信息 | 49 | * @return 角色对象信息 |
| 50 | */ | 50 | */ |
| 51 | - public SysRole selectRoleById(Long roleId); | 51 | + SysRole selectRoleById(Long roleId); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 根据用户ID查询角色 | 54 | * 根据用户ID查询角色 |
| @@ -56,7 +56,7 @@ public interface SysRoleMapper | @@ -56,7 +56,7 @@ public interface SysRoleMapper | ||
| 56 | * @param userName 用户名 | 56 | * @param userName 用户名 |
| 57 | * @return 角色列表 | 57 | * @return 角色列表 |
| 58 | */ | 58 | */ |
| 59 | - public List<SysRole> selectRolesByUserName(String userName); | 59 | + List<SysRole> selectRolesByUserName(String userName); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 校验角色名称是否唯一 | 62 | * 校验角色名称是否唯一 |
| @@ -64,7 +64,7 @@ public interface SysRoleMapper | @@ -64,7 +64,7 @@ public interface SysRoleMapper | ||
| 64 | * @param roleName 角色名称 | 64 | * @param roleName 角色名称 |
| 65 | * @return 角色信息 | 65 | * @return 角色信息 |
| 66 | */ | 66 | */ |
| 67 | - public SysRole checkRoleNameUnique(String roleName); | 67 | + SysRole checkRoleNameUnique(String roleName); |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * 校验角色权限是否唯一 | 70 | * 校验角色权限是否唯一 |
| @@ -72,7 +72,7 @@ public interface SysRoleMapper | @@ -72,7 +72,7 @@ public interface SysRoleMapper | ||
| 72 | * @param roleKey 角色权限 | 72 | * @param roleKey 角色权限 |
| 73 | * @return 角色信息 | 73 | * @return 角色信息 |
| 74 | */ | 74 | */ |
| 75 | - public SysRole checkRoleKeyUnique(String roleKey); | 75 | + SysRole checkRoleKeyUnique(String roleKey); |
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * 修改角色信息 | 78 | * 修改角色信息 |
| @@ -80,7 +80,7 @@ public interface SysRoleMapper | @@ -80,7 +80,7 @@ public interface SysRoleMapper | ||
| 80 | * @param role 角色信息 | 80 | * @param role 角色信息 |
| 81 | * @return 结果 | 81 | * @return 结果 |
| 82 | */ | 82 | */ |
| 83 | - public int updateRole(SysRole role); | 83 | + int updateRole(SysRole role); |
| 84 | 84 | ||
| 85 | /** | 85 | /** |
| 86 | * 新增角色信息 | 86 | * 新增角色信息 |
| @@ -88,7 +88,7 @@ public interface SysRoleMapper | @@ -88,7 +88,7 @@ public interface SysRoleMapper | ||
| 88 | * @param role 角色信息 | 88 | * @param role 角色信息 |
| 89 | * @return 结果 | 89 | * @return 结果 |
| 90 | */ | 90 | */ |
| 91 | - public int insertRole(SysRole role); | 91 | + int insertRole(SysRole role); |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * 通过角色ID删除角色 | 94 | * 通过角色ID删除角色 |
| @@ -96,7 +96,7 @@ public interface SysRoleMapper | @@ -96,7 +96,7 @@ public interface SysRoleMapper | ||
| 96 | * @param roleId 角色ID | 96 | * @param roleId 角色ID |
| 97 | * @return 结果 | 97 | * @return 结果 |
| 98 | */ | 98 | */ |
| 99 | - public int deleteRoleById(Long roleId); | 99 | + int deleteRoleById(Long roleId); |
| 100 | 100 | ||
| 101 | /** | 101 | /** |
| 102 | * 批量删除角色信息 | 102 | * 批量删除角色信息 |
| @@ -104,5 +104,5 @@ public interface SysRoleMapper | @@ -104,5 +104,5 @@ public interface SysRoleMapper | ||
| 104 | * @param roleIds 需要删除的角色ID | 104 | * @param roleIds 需要删除的角色ID |
| 105 | * @return 结果 | 105 | * @return 结果 |
| 106 | */ | 106 | */ |
| 107 | - public int deleteRoleByIds(Long[] roleIds); | 107 | + int deleteRoleByIds(Long[] roleIds); |
| 108 | } | 108 | } |
trash-system/src/main/java/com/trash/system/mapper/SysRoleMenuMapper.java
| @@ -17,7 +17,7 @@ public interface SysRoleMenuMapper | @@ -17,7 +17,7 @@ public interface SysRoleMenuMapper | ||
| 17 | * @param menuId 菜单ID | 17 | * @param menuId 菜单ID |
| 18 | * @return 结果 | 18 | * @return 结果 |
| 19 | */ | 19 | */ |
| 20 | - public int checkMenuExistRole(Long menuId); | 20 | + int checkMenuExistRole(Long menuId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 通过角色ID删除角色和菜单关联 | 23 | * 通过角色ID删除角色和菜单关联 |
| @@ -25,7 +25,7 @@ public interface SysRoleMenuMapper | @@ -25,7 +25,7 @@ public interface SysRoleMenuMapper | ||
| 25 | * @param roleId 角色ID | 25 | * @param roleId 角色ID |
| 26 | * @return 结果 | 26 | * @return 结果 |
| 27 | */ | 27 | */ |
| 28 | - public int deleteRoleMenuByRoleId(Long roleId); | 28 | + int deleteRoleMenuByRoleId(Long roleId); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 批量新增角色菜单信息 | 31 | * 批量新增角色菜单信息 |
| @@ -33,5 +33,5 @@ public interface SysRoleMenuMapper | @@ -33,5 +33,5 @@ public interface SysRoleMenuMapper | ||
| 33 | * @param roleMenuList 角色菜单列表 | 33 | * @param roleMenuList 角色菜单列表 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int batchRoleMenu(List<SysRoleMenu> roleMenuList); | 36 | + int batchRoleMenu(List<SysRoleMenu> roleMenuList); |
| 37 | } | 37 | } |
trash-system/src/main/java/com/trash/system/mapper/SysUserMapper.java
| @@ -18,7 +18,7 @@ public interface SysUserMapper | @@ -18,7 +18,7 @@ public interface SysUserMapper | ||
| 18 | * @param sysUser 用户信息 | 18 | * @param sysUser 用户信息 |
| 19 | * @return 用户信息集合信息 | 19 | * @return 用户信息集合信息 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysUser> selectUserList(SysUser sysUser); | 21 | + List<SysUser> selectUserList(SysUser sysUser); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 通过用户名查询用户 | 24 | * 通过用户名查询用户 |
| @@ -26,7 +26,7 @@ public interface SysUserMapper | @@ -26,7 +26,7 @@ public interface SysUserMapper | ||
| 26 | * @param userName 用户名 | 26 | * @param userName 用户名 |
| 27 | * @return 用户对象信息 | 27 | * @return 用户对象信息 |
| 28 | */ | 28 | */ |
| 29 | - public SysUser selectUserByUserName(String userName); | 29 | + SysUser selectUserByUserName(String userName); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 通过用户ID查询用户 | 32 | * 通过用户ID查询用户 |
| @@ -34,9 +34,9 @@ public interface SysUserMapper | @@ -34,9 +34,9 @@ public interface SysUserMapper | ||
| 34 | * @param userId 用户ID | 34 | * @param userId 用户ID |
| 35 | * @return 用户对象信息 | 35 | * @return 用户对象信息 |
| 36 | */ | 36 | */ |
| 37 | - public SysUser selectUserById(String userId); | 37 | + SysUser selectUserById(String userId); |
| 38 | 38 | ||
| 39 | - public List<String>selectUserNameByPostCodeAndDeptId(String postCode,Long deptId); | 39 | + List<String>selectUserNameByPostCodeAndDeptId(String postCode, Long deptId); |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 新增用户信息 | 42 | * 新增用户信息 |
| @@ -44,7 +44,7 @@ public interface SysUserMapper | @@ -44,7 +44,7 @@ public interface SysUserMapper | ||
| 44 | * @param user 用户信息 | 44 | * @param user 用户信息 |
| 45 | * @return 结果 | 45 | * @return 结果 |
| 46 | */ | 46 | */ |
| 47 | - public int insertUser(SysUser user); | 47 | + int insertUser(SysUser user); |
| 48 | 48 | ||
| 49 | /** | 49 | /** |
| 50 | * 修改用户信息 | 50 | * 修改用户信息 |
| @@ -52,7 +52,7 @@ public interface SysUserMapper | @@ -52,7 +52,7 @@ public interface SysUserMapper | ||
| 52 | * @param user 用户信息 | 52 | * @param user 用户信息 |
| 53 | * @return 结果 | 53 | * @return 结果 |
| 54 | */ | 54 | */ |
| 55 | - public int updateUser(SysUser user); | 55 | + int updateUser(SysUser user); |
| 56 | 56 | ||
| 57 | /** | 57 | /** |
| 58 | * 修改用户头像 | 58 | * 修改用户头像 |
| @@ -61,7 +61,7 @@ public interface SysUserMapper | @@ -61,7 +61,7 @@ public interface SysUserMapper | ||
| 61 | * @param avatar 头像地址 | 61 | * @param avatar 头像地址 |
| 62 | * @return 结果 | 62 | * @return 结果 |
| 63 | */ | 63 | */ |
| 64 | - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); | 64 | + int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); |
| 65 | 65 | ||
| 66 | /** | 66 | /** |
| 67 | * 重置用户密码 | 67 | * 重置用户密码 |
| @@ -70,7 +70,7 @@ public interface SysUserMapper | @@ -70,7 +70,7 @@ public interface SysUserMapper | ||
| 70 | * @param password 密码 | 70 | * @param password 密码 |
| 71 | * @return 结果 | 71 | * @return 结果 |
| 72 | */ | 72 | */ |
| 73 | - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); | 73 | + int resetUserPwd(@Param("userName") String userName, @Param("password") String password); |
| 74 | 74 | ||
| 75 | /** | 75 | /** |
| 76 | * 通过用户ID删除用户 | 76 | * 通过用户ID删除用户 |
| @@ -78,7 +78,7 @@ public interface SysUserMapper | @@ -78,7 +78,7 @@ public interface SysUserMapper | ||
| 78 | * @param userId 用户ID | 78 | * @param userId 用户ID |
| 79 | * @return 结果 | 79 | * @return 结果 |
| 80 | */ | 80 | */ |
| 81 | - public int deleteUserById(String userId); | 81 | + int deleteUserById(String userId); |
| 82 | 82 | ||
| 83 | /** | 83 | /** |
| 84 | * 批量删除用户信息 | 84 | * 批量删除用户信息 |
| @@ -86,7 +86,7 @@ public interface SysUserMapper | @@ -86,7 +86,7 @@ public interface SysUserMapper | ||
| 86 | * @param userIds 需要删除的用户ID | 86 | * @param userIds 需要删除的用户ID |
| 87 | * @return 结果 | 87 | * @return 结果 |
| 88 | */ | 88 | */ |
| 89 | - public int deleteUserByIds(String[] userIds); | 89 | + int deleteUserByIds(String[] userIds); |
| 90 | 90 | ||
| 91 | /** | 91 | /** |
| 92 | * 校验用户名称是否唯一 | 92 | * 校验用户名称是否唯一 |
| @@ -94,7 +94,7 @@ public interface SysUserMapper | @@ -94,7 +94,7 @@ public interface SysUserMapper | ||
| 94 | * @param userName 用户名称 | 94 | * @param userName 用户名称 |
| 95 | * @return 结果 | 95 | * @return 结果 |
| 96 | */ | 96 | */ |
| 97 | - public int checkUserNameUnique(String userName); | 97 | + int checkUserNameUnique(String userName); |
| 98 | 98 | ||
| 99 | /** | 99 | /** |
| 100 | * 校验手机号码是否唯一 | 100 | * 校验手机号码是否唯一 |
| @@ -102,7 +102,7 @@ public interface SysUserMapper | @@ -102,7 +102,7 @@ public interface SysUserMapper | ||
| 102 | * @param phonenumber 手机号码 | 102 | * @param phonenumber 手机号码 |
| 103 | * @return 结果 | 103 | * @return 结果 |
| 104 | */ | 104 | */ |
| 105 | - public SysUser checkPhoneUnique(String phonenumber); | 105 | + SysUser checkPhoneUnique(String phonenumber); |
| 106 | 106 | ||
| 107 | /** | 107 | /** |
| 108 | * 校验email是否唯一 | 108 | * 校验email是否唯一 |
| @@ -110,5 +110,5 @@ public interface SysUserMapper | @@ -110,5 +110,5 @@ public interface SysUserMapper | ||
| 110 | * @param email 用户邮箱 | 110 | * @param email 用户邮箱 |
| 111 | * @return 结果 | 111 | * @return 结果 |
| 112 | */ | 112 | */ |
| 113 | - public SysUser checkEmailUnique(String email); | 113 | + SysUser checkEmailUnique(String email); |
| 114 | } | 114 | } |
trash-system/src/main/java/com/trash/system/mapper/SysUserPostMapper.java
| @@ -17,7 +17,7 @@ public interface SysUserPostMapper | @@ -17,7 +17,7 @@ public interface SysUserPostMapper | ||
| 17 | * @param userId 用户ID | 17 | * @param userId 用户ID |
| 18 | * @return 结果 | 18 | * @return 结果 |
| 19 | */ | 19 | */ |
| 20 | - public int deleteUserPostByUserId(String userId); | 20 | + int deleteUserPostByUserId(String userId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 通过岗位ID查询岗位使用数量 | 23 | * 通过岗位ID查询岗位使用数量 |
| @@ -25,7 +25,7 @@ public interface SysUserPostMapper | @@ -25,7 +25,7 @@ public interface SysUserPostMapper | ||
| 25 | * @param postId 岗位ID | 25 | * @param postId 岗位ID |
| 26 | * @return 结果 | 26 | * @return 结果 |
| 27 | */ | 27 | */ |
| 28 | - public int countUserPostById(Long postId); | 28 | + int countUserPostById(Long postId); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 批量删除用户和岗位关联 | 31 | * 批量删除用户和岗位关联 |
| @@ -33,7 +33,7 @@ public interface SysUserPostMapper | @@ -33,7 +33,7 @@ public interface SysUserPostMapper | ||
| 33 | * @param ids 需要删除的数据ID | 33 | * @param ids 需要删除的数据ID |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int deleteUserPost(Long[] ids); | 36 | + int deleteUserPost(Long[] ids); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 批量新增用户岗位信息 | 39 | * 批量新增用户岗位信息 |
| @@ -41,5 +41,5 @@ public interface SysUserPostMapper | @@ -41,5 +41,5 @@ public interface SysUserPostMapper | ||
| 41 | * @param userPostList 用户角色列表 | 41 | * @param userPostList 用户角色列表 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int batchUserPost(List<SysUserPost> userPostList); | 44 | + int batchUserPost(List<SysUserPost> userPostList); |
| 45 | } | 45 | } |
trash-system/src/main/java/com/trash/system/mapper/SysUserRoleMapper.java
| @@ -18,7 +18,7 @@ public interface SysUserRoleMapper | @@ -18,7 +18,7 @@ public interface SysUserRoleMapper | ||
| 18 | * @param userId 用户ID | 18 | * @param userId 用户ID |
| 19 | * @return 结果 | 19 | * @return 结果 |
| 20 | */ | 20 | */ |
| 21 | - public int deleteUserRoleByUserId(String userId); | 21 | + int deleteUserRoleByUserId(String userId); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 批量删除用户和角色关联 | 24 | * 批量删除用户和角色关联 |
| @@ -26,7 +26,7 @@ public interface SysUserRoleMapper | @@ -26,7 +26,7 @@ public interface SysUserRoleMapper | ||
| 26 | * @param ids 需要删除的数据ID | 26 | * @param ids 需要删除的数据ID |
| 27 | * @return 结果 | 27 | * @return 结果 |
| 28 | */ | 28 | */ |
| 29 | - public int deleteUserRole(Long[] ids); | 29 | + int deleteUserRole(Long[] ids); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 通过角色ID查询角色使用数量 | 32 | * 通过角色ID查询角色使用数量 |
| @@ -34,7 +34,7 @@ public interface SysUserRoleMapper | @@ -34,7 +34,7 @@ public interface SysUserRoleMapper | ||
| 34 | * @param roleId 角色ID | 34 | * @param roleId 角色ID |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int countUserRoleByRoleId(Long roleId); | 37 | + int countUserRoleByRoleId(Long roleId); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 批量新增用户角色信息 | 40 | * 批量新增用户角色信息 |
| @@ -42,7 +42,7 @@ public interface SysUserRoleMapper | @@ -42,7 +42,7 @@ public interface SysUserRoleMapper | ||
| 42 | * @param userRoleList 用户角色列表 | 42 | * @param userRoleList 用户角色列表 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int batchUserRole(List<SysUserRole> userRoleList); | 45 | + int batchUserRole(List<SysUserRole> userRoleList); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除用户和角色关联信息 | 48 | * 删除用户和角色关联信息 |
| @@ -50,7 +50,7 @@ public interface SysUserRoleMapper | @@ -50,7 +50,7 @@ public interface SysUserRoleMapper | ||
| 50 | * @param userRole 用户和角色关联信息 | 50 | * @param userRole 用户和角色关联信息 |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteUserRoleInfo(SysUserRole userRole); | 53 | + int deleteUserRoleInfo(SysUserRole userRole); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量取消授权用户角色 | 56 | * 批量取消授权用户角色 |
| @@ -59,5 +59,5 @@ public interface SysUserRoleMapper | @@ -59,5 +59,5 @@ public interface SysUserRoleMapper | ||
| 59 | * @param userIds 需要删除的用户数据ID | 59 | * @param userIds 需要删除的用户数据ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds); | 62 | + int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds); |
| 63 | } | 63 | } |
trash-system/src/main/java/com/trash/system/service/ISysConfigService.java
| @@ -17,7 +17,7 @@ public interface ISysConfigService | @@ -17,7 +17,7 @@ public interface ISysConfigService | ||
| 17 | * @param configId 参数配置ID | 17 | * @param configId 参数配置ID |
| 18 | * @return 参数配置信息 | 18 | * @return 参数配置信息 |
| 19 | */ | 19 | */ |
| 20 | - public SysConfig selectConfigById(Long configId); | 20 | + SysConfig selectConfigById(Long configId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 根据键名查询参数配置信息 | 23 | * 根据键名查询参数配置信息 |
| @@ -25,7 +25,7 @@ public interface ISysConfigService | @@ -25,7 +25,7 @@ public interface ISysConfigService | ||
| 25 | * @param configKey 参数键名 | 25 | * @param configKey 参数键名 |
| 26 | * @return 参数键值 | 26 | * @return 参数键值 |
| 27 | */ | 27 | */ |
| 28 | - public String selectConfigByKey(String configKey); | 28 | + String selectConfigByKey(String configKey); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 查询参数配置列表 | 31 | * 查询参数配置列表 |
| @@ -33,7 +33,7 @@ public interface ISysConfigService | @@ -33,7 +33,7 @@ public interface ISysConfigService | ||
| 33 | * @param config 参数配置信息 | 33 | * @param config 参数配置信息 |
| 34 | * @return 参数配置集合 | 34 | * @return 参数配置集合 |
| 35 | */ | 35 | */ |
| 36 | - public List<SysConfig> selectConfigList(SysConfig config); | 36 | + List<SysConfig> selectConfigList(SysConfig config); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 新增参数配置 | 39 | * 新增参数配置 |
| @@ -41,7 +41,7 @@ public interface ISysConfigService | @@ -41,7 +41,7 @@ public interface ISysConfigService | ||
| 41 | * @param config 参数配置信息 | 41 | * @param config 参数配置信息 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int insertConfig(SysConfig config); | 44 | + int insertConfig(SysConfig config); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 修改参数配置 | 47 | * 修改参数配置 |
| @@ -49,7 +49,7 @@ public interface ISysConfigService | @@ -49,7 +49,7 @@ public interface ISysConfigService | ||
| 49 | * @param config 参数配置信息 | 49 | * @param config 参数配置信息 |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int updateConfig(SysConfig config); | 52 | + int updateConfig(SysConfig config); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除参数信息 | 55 | * 批量删除参数信息 |
| @@ -57,12 +57,12 @@ public interface ISysConfigService | @@ -57,12 +57,12 @@ public interface ISysConfigService | ||
| 57 | * @param configIds 需要删除的参数ID | 57 | * @param configIds 需要删除的参数ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteConfigByIds(Long[] configIds); | 60 | + int deleteConfigByIds(Long[] configIds); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 清空缓存数据 | 63 | * 清空缓存数据 |
| 64 | */ | 64 | */ |
| 65 | - public void clearCache(); | 65 | + void clearCache(); |
| 66 | 66 | ||
| 67 | /** | 67 | /** |
| 68 | * 校验参数键名是否唯一 | 68 | * 校验参数键名是否唯一 |
| @@ -70,5 +70,5 @@ public interface ISysConfigService | @@ -70,5 +70,5 @@ public interface ISysConfigService | ||
| 70 | * @param config 参数信息 | 70 | * @param config 参数信息 |
| 71 | * @return 结果 | 71 | * @return 结果 |
| 72 | */ | 72 | */ |
| 73 | - public String checkConfigKeyUnique(SysConfig config); | 73 | + String checkConfigKeyUnique(SysConfig config); |
| 74 | } | 74 | } |
trash-system/src/main/java/com/trash/system/service/ISysDeptService.java
| @@ -18,7 +18,7 @@ public interface ISysDeptService | @@ -18,7 +18,7 @@ public interface ISysDeptService | ||
| 18 | * @param dept 部门信息 | 18 | * @param dept 部门信息 |
| 19 | * @return 部门信息集合 | 19 | * @return 部门信息集合 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysDept> selectDeptList(SysDept dept); | 21 | + List<SysDept> selectDeptList(SysDept dept); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 构建前端所需要树结构 | 24 | * 构建前端所需要树结构 |
| @@ -26,7 +26,7 @@ public interface ISysDeptService | @@ -26,7 +26,7 @@ public interface ISysDeptService | ||
| 26 | * @param depts 部门列表 | 26 | * @param depts 部门列表 |
| 27 | * @return 树结构列表 | 27 | * @return 树结构列表 |
| 28 | */ | 28 | */ |
| 29 | - public List<SysDept> buildDeptTree(List<SysDept> depts); | 29 | + List<SysDept> buildDeptTree(List<SysDept> depts); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 构建前端所需要下拉树结构 | 32 | * 构建前端所需要下拉树结构 |
| @@ -34,7 +34,7 @@ public interface ISysDeptService | @@ -34,7 +34,7 @@ public interface ISysDeptService | ||
| 34 | * @param depts 部门列表 | 34 | * @param depts 部门列表 |
| 35 | * @return 下拉树结构列表 | 35 | * @return 下拉树结构列表 |
| 36 | */ | 36 | */ |
| 37 | - public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts); | 37 | + List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 根据角色ID查询部门树信息 | 40 | * 根据角色ID查询部门树信息 |
| @@ -42,7 +42,7 @@ public interface ISysDeptService | @@ -42,7 +42,7 @@ public interface ISysDeptService | ||
| 42 | * @param roleId 角色ID | 42 | * @param roleId 角色ID |
| 43 | * @return 选中部门列表 | 43 | * @return 选中部门列表 |
| 44 | */ | 44 | */ |
| 45 | - public List<Integer> selectDeptListByRoleId(Long roleId); | 45 | + List<Integer> selectDeptListByRoleId(Long roleId); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 根据部门ID查询信息 | 48 | * 根据部门ID查询信息 |
| @@ -50,7 +50,7 @@ public interface ISysDeptService | @@ -50,7 +50,7 @@ public interface ISysDeptService | ||
| 50 | * @param deptId 部门ID | 50 | * @param deptId 部门ID |
| 51 | * @return 部门信息 | 51 | * @return 部门信息 |
| 52 | */ | 52 | */ |
| 53 | - public SysDept selectDeptById(Long deptId); | 53 | + SysDept selectDeptById(Long deptId); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 根据ID查询所有子部门（正常状态） | 56 | * 根据ID查询所有子部门（正常状态） |
| @@ -58,7 +58,7 @@ public interface ISysDeptService | @@ -58,7 +58,7 @@ public interface ISysDeptService | ||
| 58 | * @param deptId 部门ID | 58 | * @param deptId 部门ID |
| 59 | * @return 子部门数 | 59 | * @return 子部门数 |
| 60 | */ | 60 | */ |
| 61 | - public int selectNormalChildrenDeptById(Long deptId); | 61 | + int selectNormalChildrenDeptById(Long deptId); |
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * 是否存在部门子节点 | 64 | * 是否存在部门子节点 |
| @@ -66,7 +66,7 @@ public interface ISysDeptService | @@ -66,7 +66,7 @@ public interface ISysDeptService | ||
| 66 | * @param deptId 部门ID | 66 | * @param deptId 部门ID |
| 67 | * @return 结果 | 67 | * @return 结果 |
| 68 | */ | 68 | */ |
| 69 | - public boolean hasChildByDeptId(Long deptId); | 69 | + boolean hasChildByDeptId(Long deptId); |
| 70 | 70 | ||
| 71 | /** | 71 | /** |
| 72 | * 查询部门是否存在用户 | 72 | * 查询部门是否存在用户 |
| @@ -74,7 +74,7 @@ public interface ISysDeptService | @@ -74,7 +74,7 @@ public interface ISysDeptService | ||
| 74 | * @param deptId 部门ID | 74 | * @param deptId 部门ID |
| 75 | * @return 结果 true 存在 false 不存在 | 75 | * @return 结果 true 存在 false 不存在 |
| 76 | */ | 76 | */ |
| 77 | - public boolean checkDeptExistUser(Long deptId); | 77 | + boolean checkDeptExistUser(Long deptId); |
| 78 | 78 | ||
| 79 | /** | 79 | /** |
| 80 | * 校验部门名称是否唯一 | 80 | * 校验部门名称是否唯一 |
| @@ -82,7 +82,7 @@ public interface ISysDeptService | @@ -82,7 +82,7 @@ public interface ISysDeptService | ||
| 82 | * @param dept 部门信息 | 82 | * @param dept 部门信息 |
| 83 | * @return 结果 | 83 | * @return 结果 |
| 84 | */ | 84 | */ |
| 85 | - public String checkDeptNameUnique(SysDept dept); | 85 | + String checkDeptNameUnique(SysDept dept); |
| 86 | 86 | ||
| 87 | /** | 87 | /** |
| 88 | * 新增保存部门信息 | 88 | * 新增保存部门信息 |
| @@ -90,7 +90,7 @@ public interface ISysDeptService | @@ -90,7 +90,7 @@ public interface ISysDeptService | ||
| 90 | * @param dept 部门信息 | 90 | * @param dept 部门信息 |
| 91 | * @return 结果 | 91 | * @return 结果 |
| 92 | */ | 92 | */ |
| 93 | - public int insertDept(SysDept dept); | 93 | + int insertDept(SysDept dept); |
| 94 | 94 | ||
| 95 | /** | 95 | /** |
| 96 | * 修改保存部门信息 | 96 | * 修改保存部门信息 |
| @@ -98,7 +98,7 @@ public interface ISysDeptService | @@ -98,7 +98,7 @@ public interface ISysDeptService | ||
| 98 | * @param dept 部门信息 | 98 | * @param dept 部门信息 |
| 99 | * @return 结果 | 99 | * @return 结果 |
| 100 | */ | 100 | */ |
| 101 | - public int updateDept(SysDept dept); | 101 | + int updateDept(SysDept dept); |
| 102 | 102 | ||
| 103 | /** | 103 | /** |
| 104 | * 删除部门管理信息 | 104 | * 删除部门管理信息 |
| @@ -106,5 +106,5 @@ public interface ISysDeptService | @@ -106,5 +106,5 @@ public interface ISysDeptService | ||
| 106 | * @param deptId 部门ID | 106 | * @param deptId 部门ID |
| 107 | * @return 结果 | 107 | * @return 结果 |
| 108 | */ | 108 | */ |
| 109 | - public int deleteDeptById(Long deptId); | 109 | + int deleteDeptById(Long deptId); |
| 110 | } | 110 | } |
trash-system/src/main/java/com/trash/system/service/ISysDictDataService.java
| @@ -17,7 +17,7 @@ public interface ISysDictDataService | @@ -17,7 +17,7 @@ public interface ISysDictDataService | ||
| 17 | * @param dictData 字典数据信息 | 17 | * @param dictData 字典数据信息 |
| 18 | * @return 字典数据集合信息 | 18 | * @return 字典数据集合信息 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysDictData> selectDictDataList(SysDictData dictData); | 20 | + List<SysDictData> selectDictDataList(SysDictData dictData); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 根据字典类型和字典键值查询字典数据信息 | 23 | * 根据字典类型和字典键值查询字典数据信息 |
| @@ -26,7 +26,7 @@ public interface ISysDictDataService | @@ -26,7 +26,7 @@ public interface ISysDictDataService | ||
| 26 | * @param dictValue 字典键值 | 26 | * @param dictValue 字典键值 |
| 27 | * @return 字典标签 | 27 | * @return 字典标签 |
| 28 | */ | 28 | */ |
| 29 | - public String selectDictLabel(String dictType, String dictValue); | 29 | + String selectDictLabel(String dictType, String dictValue); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 根据字典数据ID查询信息 | 32 | * 根据字典数据ID查询信息 |
| @@ -34,7 +34,7 @@ public interface ISysDictDataService | @@ -34,7 +34,7 @@ public interface ISysDictDataService | ||
| 34 | * @param dictCode 字典数据ID | 34 | * @param dictCode 字典数据ID |
| 35 | * @return 字典数据 | 35 | * @return 字典数据 |
| 36 | */ | 36 | */ |
| 37 | - public SysDictData selectDictDataById(Long dictCode); | 37 | + SysDictData selectDictDataById(Long dictCode); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 批量删除字典数据信息 | 40 | * 批量删除字典数据信息 |
| @@ -42,7 +42,7 @@ public interface ISysDictDataService | @@ -42,7 +42,7 @@ public interface ISysDictDataService | ||
| 42 | * @param dictCodes 需要删除的字典数据ID | 42 | * @param dictCodes 需要删除的字典数据ID |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int deleteDictDataByIds(Long[] dictCodes); | 45 | + int deleteDictDataByIds(Long[] dictCodes); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 新增保存字典数据信息 | 48 | * 新增保存字典数据信息 |
| @@ -50,7 +50,7 @@ public interface ISysDictDataService | @@ -50,7 +50,7 @@ public interface ISysDictDataService | ||
| 50 | * @param dictData 字典数据信息 | 50 | * @param dictData 字典数据信息 |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int insertDictData(SysDictData dictData); | 53 | + int insertDictData(SysDictData dictData); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 修改保存字典数据信息 | 56 | * 修改保存字典数据信息 |
| @@ -58,5 +58,5 @@ public interface ISysDictDataService | @@ -58,5 +58,5 @@ public interface ISysDictDataService | ||
| 58 | * @param dictData 字典数据信息 | 58 | * @param dictData 字典数据信息 |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int updateDictData(SysDictData dictData); | 61 | + int updateDictData(SysDictData dictData); |
| 62 | } | 62 | } |
trash-system/src/main/java/com/trash/system/service/ISysDictTypeService.java
| @@ -18,14 +18,14 @@ public interface ISysDictTypeService | @@ -18,14 +18,14 @@ public interface ISysDictTypeService | ||
| 18 | * @param dictType 字典类型信息 | 18 | * @param dictType 字典类型信息 |
| 19 | * @return 字典类型集合信息 | 19 | * @return 字典类型集合信息 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysDictType> selectDictTypeList(SysDictType dictType); | 21 | + List<SysDictType> selectDictTypeList(SysDictType dictType); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 根据所有字典类型 | 24 | * 根据所有字典类型 |
| 25 | * | 25 | * |
| 26 | * @return 字典类型集合信息 | 26 | * @return 字典类型集合信息 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysDictType> selectDictTypeAll(); | 28 | + List<SysDictType> selectDictTypeAll(); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 根据字典类型查询字典数据 | 31 | * 根据字典类型查询字典数据 |
| @@ -33,7 +33,7 @@ public interface ISysDictTypeService | @@ -33,7 +33,7 @@ public interface ISysDictTypeService | ||
| 33 | * @param dictType 字典类型 | 33 | * @param dictType 字典类型 |
| 34 | * @return 字典数据集合信息 | 34 | * @return 字典数据集合信息 |
| 35 | */ | 35 | */ |
| 36 | - public List<SysDictData> selectDictDataByType(String dictType); | 36 | + List<SysDictData> selectDictDataByType(String dictType); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据字典类型ID查询信息 | 39 | * 根据字典类型ID查询信息 |
| @@ -41,7 +41,7 @@ public interface ISysDictTypeService | @@ -41,7 +41,7 @@ public interface ISysDictTypeService | ||
| 41 | * @param dictId 字典类型ID | 41 | * @param dictId 字典类型ID |
| 42 | * @return 字典类型 | 42 | * @return 字典类型 |
| 43 | */ | 43 | */ |
| 44 | - public SysDictType selectDictTypeById(Long dictId); | 44 | + SysDictType selectDictTypeById(Long dictId); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 根据字典类型查询信息 | 47 | * 根据字典类型查询信息 |
| @@ -49,7 +49,7 @@ public interface ISysDictTypeService | @@ -49,7 +49,7 @@ public interface ISysDictTypeService | ||
| 49 | * @param dictType 字典类型 | 49 | * @param dictType 字典类型 |
| 50 | * @return 字典类型 | 50 | * @return 字典类型 |
| 51 | */ | 51 | */ |
| 52 | - public SysDictType selectDictTypeByType(String dictType); | 52 | + SysDictType selectDictTypeByType(String dictType); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除字典信息 | 55 | * 批量删除字典信息 |
| @@ -57,12 +57,12 @@ public interface ISysDictTypeService | @@ -57,12 +57,12 @@ public interface ISysDictTypeService | ||
| 57 | * @param dictIds 需要删除的字典ID | 57 | * @param dictIds 需要删除的字典ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteDictTypeByIds(Long[] dictIds); | 60 | + int deleteDictTypeByIds(Long[] dictIds); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 清空缓存数据 | 63 | * 清空缓存数据 |
| 64 | */ | 64 | */ |
| 65 | - public void clearCache(); | 65 | + void clearCache(); |
| 66 | 66 | ||
| 67 | /** | 67 | /** |
| 68 | * 新增保存字典类型信息 | 68 | * 新增保存字典类型信息 |
| @@ -70,7 +70,7 @@ public interface ISysDictTypeService | @@ -70,7 +70,7 @@ public interface ISysDictTypeService | ||
| 70 | * @param dictType 字典类型信息 | 70 | * @param dictType 字典类型信息 |
| 71 | * @return 结果 | 71 | * @return 结果 |
| 72 | */ | 72 | */ |
| 73 | - public int insertDictType(SysDictType dictType); | 73 | + int insertDictType(SysDictType dictType); |
| 74 | 74 | ||
| 75 | /** | 75 | /** |
| 76 | * 修改保存字典类型信息 | 76 | * 修改保存字典类型信息 |
| @@ -78,7 +78,7 @@ public interface ISysDictTypeService | @@ -78,7 +78,7 @@ public interface ISysDictTypeService | ||
| 78 | * @param dictType 字典类型信息 | 78 | * @param dictType 字典类型信息 |
| 79 | * @return 结果 | 79 | * @return 结果 |
| 80 | */ | 80 | */ |
| 81 | - public int updateDictType(SysDictType dictType); | 81 | + int updateDictType(SysDictType dictType); |
| 82 | 82 | ||
| 83 | /** | 83 | /** |
| 84 | * 校验字典类型称是否唯一 | 84 | * 校验字典类型称是否唯一 |
| @@ -86,5 +86,5 @@ public interface ISysDictTypeService | @@ -86,5 +86,5 @@ public interface ISysDictTypeService | ||
| 86 | * @param dictType 字典类型 | 86 | * @param dictType 字典类型 |
| 87 | * @return 结果 | 87 | * @return 结果 |
| 88 | */ | 88 | */ |
| 89 | - public String checkDictTypeUnique(SysDictType dictType); | 89 | + String checkDictTypeUnique(SysDictType dictType); |
| 90 | } | 90 | } |
trash-system/src/main/java/com/trash/system/service/ISysLogininforService.java
| @@ -16,7 +16,7 @@ public interface ISysLogininforService | @@ -16,7 +16,7 @@ public interface ISysLogininforService | ||
| 16 | * | 16 | * |
| 17 | * @param logininfor 访问日志对象 | 17 | * @param logininfor 访问日志对象 |
| 18 | */ | 18 | */ |
| 19 | - public void insertLogininfor(SysLogininfor logininfor); | 19 | + void insertLogininfor(SysLogininfor logininfor); |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * 查询系统登录日志集合 | 22 | * 查询系统登录日志集合 |
| @@ -24,7 +24,7 @@ public interface ISysLogininforService | @@ -24,7 +24,7 @@ public interface ISysLogininforService | ||
| 24 | * @param logininfor 访问日志对象 | 24 | * @param logininfor 访问日志对象 |
| 25 | * @return 登录记录集合 | 25 | * @return 登录记录集合 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor); | 27 | + List<SysLogininfor> selectLogininforList(SysLogininfor logininfor); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 批量删除系统登录日志 | 30 | * 批量删除系统登录日志 |
| @@ -32,10 +32,10 @@ public interface ISysLogininforService | @@ -32,10 +32,10 @@ public interface ISysLogininforService | ||
| 32 | * @param infoIds 需要删除的登录日志ID | 32 | * @param infoIds 需要删除的登录日志ID |
| 33 | * @return | 33 | * @return |
| 34 | */ | 34 | */ |
| 35 | - public int deleteLogininforByIds(Long[] infoIds); | 35 | + int deleteLogininforByIds(Long[] infoIds); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 清空系统登录日志 | 38 | * 清空系统登录日志 |
| 39 | */ | 39 | */ |
| 40 | - public void cleanLogininfor(); | 40 | + void cleanLogininfor(); |
| 41 | } | 41 | } |
trash-system/src/main/java/com/trash/system/service/ISysMenuService.java
| @@ -21,7 +21,7 @@ public interface ISysMenuService | @@ -21,7 +21,7 @@ public interface ISysMenuService | ||
| 21 | * @param userId 用户ID | 21 | * @param userId 用户ID |
| 22 | * @return 菜单列表 | 22 | * @return 菜单列表 |
| 23 | */ | 23 | */ |
| 24 | - public List<SysMenu> selectMenuList(String userId); | 24 | + List<SysMenu> selectMenuList(String userId); |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * 根据用户查询系统菜单列表 | 27 | * 根据用户查询系统菜单列表 |
| @@ -30,7 +30,7 @@ public interface ISysMenuService | @@ -30,7 +30,7 @@ public interface ISysMenuService | ||
| 30 | * @param userId 用户ID | 30 | * @param userId 用户ID |
| 31 | * @return 菜单列表 | 31 | * @return 菜单列表 |
| 32 | */ | 32 | */ |
| 33 | - public List<SysMenu> selectMenuList(SysMenu menu, String userId); | 33 | + List<SysMenu> selectMenuList(SysMenu menu, String userId); |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * 根据用户ID查询权限 | 36 | * 根据用户ID查询权限 |
| @@ -38,7 +38,7 @@ public interface ISysMenuService | @@ -38,7 +38,7 @@ public interface ISysMenuService | ||
| 38 | * @param userId 用户ID | 38 | * @param userId 用户ID |
| 39 | * @return 权限列表 | 39 | * @return 权限列表 |
| 40 | */ | 40 | */ |
| 41 | - public Set<String> selectMenuPermsByUserId(String userId); | 41 | + Set<String> selectMenuPermsByUserId(String userId); |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * 根据用户ID查询菜单树信息 | 44 | * 根据用户ID查询菜单树信息 |
| @@ -46,9 +46,9 @@ public interface ISysMenuService | @@ -46,9 +46,9 @@ public interface ISysMenuService | ||
| 46 | * @param user 用户ID | 46 | * @param user 用户ID |
| 47 | * @return 菜单列表 | 47 | * @return 菜单列表 |
| 48 | */ | 48 | */ |
| 49 | - public List<SysMenu> selectMenuTreeByUserId(String userId); | 49 | + List<SysMenu> selectMenuTreeByUserId(String userId); |
| 50 | 50 | ||
| 51 | - public List<SysMenu> selectMenuTreeByUserId(SysUser user); | 51 | + List<SysMenu> selectMenuTreeByUserId(SysUser user); |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * 根据角色ID查询菜单树信息 | 54 | * 根据角色ID查询菜单树信息 |
| @@ -56,7 +56,7 @@ public interface ISysMenuService | @@ -56,7 +56,7 @@ public interface ISysMenuService | ||
| 56 | * @param roleId 角色ID | 56 | * @param roleId 角色ID |
| 57 | * @return 选中菜单列表 | 57 | * @return 选中菜单列表 |
| 58 | */ | 58 | */ |
| 59 | - public List<Integer> selectMenuListByRoleId(Long roleId); | 59 | + List<Integer> selectMenuListByRoleId(Long roleId); |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * 构建前端路由所需要的菜单 | 62 | * 构建前端路由所需要的菜单 |
| @@ -64,7 +64,7 @@ public interface ISysMenuService | @@ -64,7 +64,7 @@ public interface ISysMenuService | ||
| 64 | * @param menus 菜单列表 | 64 | * @param menus 菜单列表 |
| 65 | * @return 路由列表 | 65 | * @return 路由列表 |
| 66 | */ | 66 | */ |
| 67 | - public List<RouterVo> buildMenus(List<SysMenu> menus); | 67 | + List<RouterVo> buildMenus(List<SysMenu> menus); |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * 构建前端所需要树结构 | 70 | * 构建前端所需要树结构 |
| @@ -72,7 +72,7 @@ public interface ISysMenuService | @@ -72,7 +72,7 @@ public interface ISysMenuService | ||
| 72 | * @param menus 菜单列表 | 72 | * @param menus 菜单列表 |
| 73 | * @return 树结构列表 | 73 | * @return 树结构列表 |
| 74 | */ | 74 | */ |
| 75 | - public List<SysMenu> buildMenuTree(List<SysMenu> menus); | 75 | + List<SysMenu> buildMenuTree(List<SysMenu> menus); |
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * 构建前端所需要下拉树结构 | 78 | * 构建前端所需要下拉树结构 |
| @@ -80,7 +80,7 @@ public interface ISysMenuService | @@ -80,7 +80,7 @@ public interface ISysMenuService | ||
| 80 | * @param menus 菜单列表 | 80 | * @param menus 菜单列表 |
| 81 | * @return 下拉树结构列表 | 81 | * @return 下拉树结构列表 |
| 82 | */ | 82 | */ |
| 83 | - public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus); | 83 | + List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus); |
| 84 | 84 | ||
| 85 | /** | 85 | /** |
| 86 | * 根据菜单ID查询信息 | 86 | * 根据菜单ID查询信息 |
| @@ -88,7 +88,7 @@ public interface ISysMenuService | @@ -88,7 +88,7 @@ public interface ISysMenuService | ||
| 88 | * @param menuId 菜单ID | 88 | * @param menuId 菜单ID |
| 89 | * @return 菜单信息 | 89 | * @return 菜单信息 |
| 90 | */ | 90 | */ |
| 91 | - public SysMenu selectMenuById(Long menuId); | 91 | + SysMenu selectMenuById(Long menuId); |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * 是否存在菜单子节点 | 94 | * 是否存在菜单子节点 |
| @@ -96,7 +96,7 @@ public interface ISysMenuService | @@ -96,7 +96,7 @@ public interface ISysMenuService | ||
| 96 | * @param menuId 菜单ID | 96 | * @param menuId 菜单ID |
| 97 | * @return 结果 true 存在 false 不存在 | 97 | * @return 结果 true 存在 false 不存在 |
| 98 | */ | 98 | */ |
| 99 | - public boolean hasChildByMenuId(Long menuId); | 99 | + boolean hasChildByMenuId(Long menuId); |
| 100 | 100 | ||
| 101 | /** | 101 | /** |
| 102 | * 查询菜单是否存在角色 | 102 | * 查询菜单是否存在角色 |
| @@ -104,7 +104,7 @@ public interface ISysMenuService | @@ -104,7 +104,7 @@ public interface ISysMenuService | ||
| 104 | * @param menuId 菜单ID | 104 | * @param menuId 菜单ID |
| 105 | * @return 结果 true 存在 false 不存在 | 105 | * @return 结果 true 存在 false 不存在 |
| 106 | */ | 106 | */ |
| 107 | - public boolean checkMenuExistRole(Long menuId); | 107 | + boolean checkMenuExistRole(Long menuId); |
| 108 | 108 | ||
| 109 | /** | 109 | /** |
| 110 | * 新增保存菜单信息 | 110 | * 新增保存菜单信息 |
| @@ -112,7 +112,7 @@ public interface ISysMenuService | @@ -112,7 +112,7 @@ public interface ISysMenuService | ||
| 112 | * @param menu 菜单信息 | 112 | * @param menu 菜单信息 |
| 113 | * @return 结果 | 113 | * @return 结果 |
| 114 | */ | 114 | */ |
| 115 | - public int insertMenu(SysMenu menu); | 115 | + int insertMenu(SysMenu menu); |
| 116 | 116 | ||
| 117 | /** | 117 | /** |
| 118 | * 修改保存菜单信息 | 118 | * 修改保存菜单信息 |
| @@ -120,7 +120,7 @@ public interface ISysMenuService | @@ -120,7 +120,7 @@ public interface ISysMenuService | ||
| 120 | * @param menu 菜单信息 | 120 | * @param menu 菜单信息 |
| 121 | * @return 结果 | 121 | * @return 结果 |
| 122 | */ | 122 | */ |
| 123 | - public int updateMenu(SysMenu menu); | 123 | + int updateMenu(SysMenu menu); |
| 124 | 124 | ||
| 125 | /** | 125 | /** |
| 126 | * 删除菜单管理信息 | 126 | * 删除菜单管理信息 |
| @@ -128,7 +128,7 @@ public interface ISysMenuService | @@ -128,7 +128,7 @@ public interface ISysMenuService | ||
| 128 | * @param menuId 菜单ID | 128 | * @param menuId 菜单ID |
| 129 | * @return 结果 | 129 | * @return 结果 |
| 130 | */ | 130 | */ |
| 131 | - public int deleteMenuById(Long menuId); | 131 | + int deleteMenuById(Long menuId); |
| 132 | 132 | ||
| 133 | /** | 133 | /** |
| 134 | * 校验菜单名称是否唯一 | 134 | * 校验菜单名称是否唯一 |
| @@ -136,5 +136,5 @@ public interface ISysMenuService | @@ -136,5 +136,5 @@ public interface ISysMenuService | ||
| 136 | * @param menu 菜单信息 | 136 | * @param menu 菜单信息 |
| 137 | * @return 结果 | 137 | * @return 结果 |
| 138 | */ | 138 | */ |
| 139 | - public String checkMenuNameUnique(SysMenu menu); | 139 | + String checkMenuNameUnique(SysMenu menu); |
| 140 | } | 140 | } |
trash-system/src/main/java/com/trash/system/service/ISysNoticeService.java
| @@ -17,7 +17,7 @@ public interface ISysNoticeService | @@ -17,7 +17,7 @@ public interface ISysNoticeService | ||
| 17 | * @param noticeId 公告ID | 17 | * @param noticeId 公告ID |
| 18 | * @return 公告信息 | 18 | * @return 公告信息 |
| 19 | */ | 19 | */ |
| 20 | - public SysNotice selectNoticeById(Long noticeId); | 20 | + SysNotice selectNoticeById(Long noticeId); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询公告列表 | 23 | * 查询公告列表 |
| @@ -25,7 +25,7 @@ public interface ISysNoticeService | @@ -25,7 +25,7 @@ public interface ISysNoticeService | ||
| 25 | * @param notice 公告信息 | 25 | * @param notice 公告信息 |
| 26 | * @return 公告集合 | 26 | * @return 公告集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysNotice> selectNoticeList(SysNotice notice); | 28 | + List<SysNotice> selectNoticeList(SysNotice notice); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增公告 | 31 | * 新增公告 |
| @@ -33,7 +33,7 @@ public interface ISysNoticeService | @@ -33,7 +33,7 @@ public interface ISysNoticeService | ||
| 33 | * @param notice 公告信息 | 33 | * @param notice 公告信息 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertNotice(SysNotice notice); | 36 | + int insertNotice(SysNotice notice); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改公告 | 39 | * 修改公告 |
| @@ -41,7 +41,7 @@ public interface ISysNoticeService | @@ -41,7 +41,7 @@ public interface ISysNoticeService | ||
| 41 | * @param notice 公告信息 | 41 | * @param notice 公告信息 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateNotice(SysNotice notice); | 44 | + int updateNotice(SysNotice notice); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 删除公告信息 | 47 | * 删除公告信息 |
| @@ -49,7 +49,7 @@ public interface ISysNoticeService | @@ -49,7 +49,7 @@ public interface ISysNoticeService | ||
| 49 | * @param noticeId 公告ID | 49 | * @param noticeId 公告ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteNoticeById(Long noticeId); | 52 | + int deleteNoticeById(Long noticeId); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除公告信息 | 55 | * 批量删除公告信息 |
| @@ -57,5 +57,5 @@ public interface ISysNoticeService | @@ -57,5 +57,5 @@ public interface ISysNoticeService | ||
| 57 | * @param noticeIds 需要删除的公告ID | 57 | * @param noticeIds 需要删除的公告ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteNoticeByIds(Long[] noticeIds); | 60 | + int deleteNoticeByIds(Long[] noticeIds); |
| 61 | } | 61 | } |
trash-system/src/main/java/com/trash/system/service/ISysOperLogService.java
| @@ -16,7 +16,7 @@ public interface ISysOperLogService | @@ -16,7 +16,7 @@ public interface ISysOperLogService | ||
| 16 | * | 16 | * |
| 17 | * @param operLog 操作日志对象 | 17 | * @param operLog 操作日志对象 |
| 18 | */ | 18 | */ |
| 19 | - public void insertOperlog(SysOperLog operLog); | 19 | + void insertOperlog(SysOperLog operLog); |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * 查询系统操作日志集合 | 22 | * 查询系统操作日志集合 |
| @@ -24,7 +24,7 @@ public interface ISysOperLogService | @@ -24,7 +24,7 @@ public interface ISysOperLogService | ||
| 24 | * @param operLog 操作日志对象 | 24 | * @param operLog 操作日志对象 |
| 25 | * @return 操作日志集合 | 25 | * @return 操作日志集合 |
| 26 | */ | 26 | */ |
| 27 | - public List<SysOperLog> selectOperLogList(SysOperLog operLog); | 27 | + List<SysOperLog> selectOperLogList(SysOperLog operLog); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | * 批量删除系统操作日志 | 30 | * 批量删除系统操作日志 |
| @@ -32,7 +32,7 @@ public interface ISysOperLogService | @@ -32,7 +32,7 @@ public interface ISysOperLogService | ||
| 32 | * @param operIds 需要删除的操作日志ID | 32 | * @param operIds 需要删除的操作日志ID |
| 33 | * @return 结果 | 33 | * @return 结果 |
| 34 | */ | 34 | */ |
| 35 | - public int deleteOperLogByIds(Long[] operIds); | 35 | + int deleteOperLogByIds(Long[] operIds); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * 查询操作日志详细 | 38 | * 查询操作日志详细 |
| @@ -40,10 +40,10 @@ public interface ISysOperLogService | @@ -40,10 +40,10 @@ public interface ISysOperLogService | ||
| 40 | * @param operId 操作ID | 40 | * @param operId 操作ID |
| 41 | * @return 操作日志对象 | 41 | * @return 操作日志对象 |
| 42 | */ | 42 | */ |
| 43 | - public SysOperLog selectOperLogById(Long operId); | 43 | + SysOperLog selectOperLogById(Long operId); |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * 清空操作日志 | 46 | * 清空操作日志 |
| 47 | */ | 47 | */ |
| 48 | - public void cleanOperLog(); | 48 | + void cleanOperLog(); |
| 49 | } | 49 | } |
trash-system/src/main/java/com/trash/system/service/ISysPostService.java
| @@ -18,14 +18,14 @@ public interface ISysPostService | @@ -18,14 +18,14 @@ public interface ISysPostService | ||
| 18 | * @param post 岗位信息 | 18 | * @param post 岗位信息 |
| 19 | * @return 岗位列表 | 19 | * @return 岗位列表 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysPost> selectPostList(SysPost post); | 21 | + List<SysPost> selectPostList(SysPost post); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询所有岗位 | 24 | * 查询所有岗位 |
| 25 | * | 25 | * |
| 26 | * @return 岗位列表 | 26 | * @return 岗位列表 |
| 27 | */ | 27 | */ |
| 28 | - public List<SysPost> selectPostAll(); | 28 | + List<SysPost> selectPostAll(); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 通过岗位ID查询岗位信息 | 31 | * 通过岗位ID查询岗位信息 |
| @@ -33,7 +33,7 @@ public interface ISysPostService | @@ -33,7 +33,7 @@ public interface ISysPostService | ||
| 33 | * @param postId 岗位ID | 33 | * @param postId 岗位ID |
| 34 | * @return 角色对象信息 | 34 | * @return 角色对象信息 |
| 35 | */ | 35 | */ |
| 36 | - public SysPost selectPostById(Long postId); | 36 | + SysPost selectPostById(Long postId); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据用户ID获取岗位选择框列表 | 39 | * 根据用户ID获取岗位选择框列表 |
| @@ -41,7 +41,7 @@ public interface ISysPostService | @@ -41,7 +41,7 @@ public interface ISysPostService | ||
| 41 | * @param userId 用户ID | 41 | * @param userId 用户ID |
| 42 | * @return 选中岗位ID列表 | 42 | * @return 选中岗位ID列表 |
| 43 | */ | 43 | */ |
| 44 | - public List<Integer> selectPostListByUserId(String userId); | 44 | + List<Integer> selectPostListByUserId(String userId); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 根据用户ID获取PostCode | 47 | * 根据用户ID获取PostCode |
| @@ -49,7 +49,7 @@ public interface ISysPostService | @@ -49,7 +49,7 @@ public interface ISysPostService | ||
| 49 | * @param userId 用户ID | 49 | * @param userId 用户ID |
| 50 | * @return 选中岗位PostCode列表 | 50 | * @return 选中岗位PostCode列表 |
| 51 | */ | 51 | */ |
| 52 | - public Set<String> selectPostCodeByUserId(String userId); | 52 | + Set<String> selectPostCodeByUserId(String userId); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 校验岗位名称 | 55 | * 校验岗位名称 |
| @@ -57,7 +57,7 @@ public interface ISysPostService | @@ -57,7 +57,7 @@ public interface ISysPostService | ||
| 57 | * @param post 岗位信息 | 57 | * @param post 岗位信息 |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public String checkPostNameUnique(SysPost post); | 60 | + String checkPostNameUnique(SysPost post); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 校验岗位编码 | 63 | * 校验岗位编码 |
| @@ -65,7 +65,7 @@ public interface ISysPostService | @@ -65,7 +65,7 @@ public interface ISysPostService | ||
| 65 | * @param post 岗位信息 | 65 | * @param post 岗位信息 |
| 66 | * @return 结果 | 66 | * @return 结果 |
| 67 | */ | 67 | */ |
| 68 | - public String checkPostCodeUnique(SysPost post); | 68 | + String checkPostCodeUnique(SysPost post); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 通过岗位ID查询岗位使用数量 | 71 | * 通过岗位ID查询岗位使用数量 |
| @@ -73,7 +73,7 @@ public interface ISysPostService | @@ -73,7 +73,7 @@ public interface ISysPostService | ||
| 73 | * @param postId 岗位ID | 73 | * @param postId 岗位ID |
| 74 | * @return 结果 | 74 | * @return 结果 |
| 75 | */ | 75 | */ |
| 76 | - public int countUserPostById(Long postId); | 76 | + int countUserPostById(Long postId); |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * 删除岗位信息 | 79 | * 删除岗位信息 |
| @@ -81,7 +81,7 @@ public interface ISysPostService | @@ -81,7 +81,7 @@ public interface ISysPostService | ||
| 81 | * @param postId 岗位ID | 81 | * @param postId 岗位ID |
| 82 | * @return 结果 | 82 | * @return 结果 |
| 83 | */ | 83 | */ |
| 84 | - public int deletePostById(Long postId); | 84 | + int deletePostById(Long postId); |
| 85 | 85 | ||
| 86 | /** | 86 | /** |
| 87 | * 批量删除岗位信息 | 87 | * 批量删除岗位信息 |
| @@ -90,7 +90,7 @@ public interface ISysPostService | @@ -90,7 +90,7 @@ public interface ISysPostService | ||
| 90 | * @return 结果 | 90 | * @return 结果 |
| 91 | * @throws Exception 异常 | 91 | * @throws Exception 异常 |
| 92 | */ | 92 | */ |
| 93 | - public int deletePostByIds(Long[] postIds); | 93 | + int deletePostByIds(Long[] postIds); |
| 94 | 94 | ||
| 95 | /** | 95 | /** |
| 96 | * 新增保存岗位信息 | 96 | * 新增保存岗位信息 |
| @@ -98,7 +98,7 @@ public interface ISysPostService | @@ -98,7 +98,7 @@ public interface ISysPostService | ||
| 98 | * @param post 岗位信息 | 98 | * @param post 岗位信息 |
| 99 | * @return 结果 | 99 | * @return 结果 |
| 100 | */ | 100 | */ |
| 101 | - public int insertPost(SysPost post); | 101 | + int insertPost(SysPost post); |
| 102 | 102 | ||
| 103 | /** | 103 | /** |
| 104 | * 修改保存岗位信息 | 104 | * 修改保存岗位信息 |
| @@ -106,5 +106,5 @@ public interface ISysPostService | @@ -106,5 +106,5 @@ public interface ISysPostService | ||
| 106 | * @param post 岗位信息 | 106 | * @param post 岗位信息 |
| 107 | * @return 结果 | 107 | * @return 结果 |
| 108 | */ | 108 | */ |
| 109 | - public int updatePost(SysPost post); | 109 | + int updatePost(SysPost post); |
| 110 | } | 110 | } |
trash-system/src/main/java/com/trash/system/service/ISysRoleService.java
| @@ -18,7 +18,7 @@ public interface ISysRoleService | @@ -18,7 +18,7 @@ public interface ISysRoleService | ||
| 18 | * @param role 角色信息 | 18 | * @param role 角色信息 |
| 19 | * @return 角色数据集合信息 | 19 | * @return 角色数据集合信息 |
| 20 | */ | 20 | */ |
| 21 | - public List<SysRole> selectRoleList(SysRole role); | 21 | + List<SysRole> selectRoleList(SysRole role); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 根据用户ID查询角色 | 24 | * 根据用户ID查询角色 |
| @@ -26,14 +26,14 @@ public interface ISysRoleService | @@ -26,14 +26,14 @@ public interface ISysRoleService | ||
| 26 | * @param userId 用户ID | 26 | * @param userId 用户ID |
| 27 | * @return 权限列表 | 27 | * @return 权限列表 |
| 28 | */ | 28 | */ |
| 29 | - public Set<String> selectRolePermissionByUserId(String userId); | 29 | + Set<String> selectRolePermissionByUserId(String userId); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 查询所有角色 | 32 | * 查询所有角色 |
| 33 | * | 33 | * |
| 34 | * @return 角色列表 | 34 | * @return 角色列表 |
| 35 | */ | 35 | */ |
| 36 | - public List<SysRole> selectRoleAll(); | 36 | + List<SysRole> selectRoleAll(); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据用户ID获取角色选择框列表 | 39 | * 根据用户ID获取角色选择框列表 |
| @@ -41,7 +41,7 @@ public interface ISysRoleService | @@ -41,7 +41,7 @@ public interface ISysRoleService | ||
| 41 | * @param userId 用户ID | 41 | * @param userId 用户ID |
| 42 | * @return 选中角色ID列表 | 42 | * @return 选中角色ID列表 |
| 43 | */ | 43 | */ |
| 44 | - public List<Integer> selectRoleListByUserId(String userId); | 44 | + List<Integer> selectRoleListByUserId(String userId); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 通过角色ID查询角色 | 47 | * 通过角色ID查询角色 |
| @@ -49,7 +49,7 @@ public interface ISysRoleService | @@ -49,7 +49,7 @@ public interface ISysRoleService | ||
| 49 | * @param roleId 角色ID | 49 | * @param roleId 角色ID |
| 50 | * @return 角色对象信息 | 50 | * @return 角色对象信息 |
| 51 | */ | 51 | */ |
| 52 | - public SysRole selectRoleById(Long roleId); | 52 | + SysRole selectRoleById(Long roleId); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 校验角色名称是否唯一 | 55 | * 校验角色名称是否唯一 |
| @@ -57,7 +57,7 @@ public interface ISysRoleService | @@ -57,7 +57,7 @@ public interface ISysRoleService | ||
| 57 | * @param role 角色信息 | 57 | * @param role 角色信息 |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public String checkRoleNameUnique(SysRole role); | 60 | + String checkRoleNameUnique(SysRole role); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 校验角色权限是否唯一 | 63 | * 校验角色权限是否唯一 |
| @@ -65,14 +65,14 @@ public interface ISysRoleService | @@ -65,14 +65,14 @@ public interface ISysRoleService | ||
| 65 | * @param role 角色信息 | 65 | * @param role 角色信息 |
| 66 | * @return 结果 | 66 | * @return 结果 |
| 67 | */ | 67 | */ |
| 68 | - public String checkRoleKeyUnique(SysRole role); | 68 | + String checkRoleKeyUnique(SysRole role); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 校验角色是否允许操作 | 71 | * 校验角色是否允许操作 |
| 72 | * | 72 | * |
| 73 | * @param role 角色信息 | 73 | * @param role 角色信息 |
| 74 | */ | 74 | */ |
| 75 | - public void checkRoleAllowed(SysRole role); | 75 | + void checkRoleAllowed(SysRole role); |
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * 通过角色ID查询角色使用数量 | 78 | * 通过角色ID查询角色使用数量 |
| @@ -80,7 +80,7 @@ public interface ISysRoleService | @@ -80,7 +80,7 @@ public interface ISysRoleService | ||
| 80 | * @param roleId 角色ID | 80 | * @param roleId 角色ID |
| 81 | * @return 结果 | 81 | * @return 结果 |
| 82 | */ | 82 | */ |
| 83 | - public int countUserRoleByRoleId(Long roleId); | 83 | + int countUserRoleByRoleId(Long roleId); |
| 84 | 84 | ||
| 85 | /** | 85 | /** |
| 86 | * 新增保存角色信息 | 86 | * 新增保存角色信息 |
| @@ -88,7 +88,7 @@ public interface ISysRoleService | @@ -88,7 +88,7 @@ public interface ISysRoleService | ||
| 88 | * @param role 角色信息 | 88 | * @param role 角色信息 |
| 89 | * @return 结果 | 89 | * @return 结果 |
| 90 | */ | 90 | */ |
| 91 | - public int insertRole(SysRole role); | 91 | + int insertRole(SysRole role); |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * 修改保存角色信息 | 94 | * 修改保存角色信息 |
| @@ -96,7 +96,7 @@ public interface ISysRoleService | @@ -96,7 +96,7 @@ public interface ISysRoleService | ||
| 96 | * @param role 角色信息 | 96 | * @param role 角色信息 |
| 97 | * @return 结果 | 97 | * @return 结果 |
| 98 | */ | 98 | */ |
| 99 | - public int updateRole(SysRole role); | 99 | + int updateRole(SysRole role); |
| 100 | 100 | ||
| 101 | /** | 101 | /** |
| 102 | * 修改角色状态 | 102 | * 修改角色状态 |
| @@ -104,7 +104,7 @@ public interface ISysRoleService | @@ -104,7 +104,7 @@ public interface ISysRoleService | ||
| 104 | * @param role 角色信息 | 104 | * @param role 角色信息 |
| 105 | * @return 结果 | 105 | * @return 结果 |
| 106 | */ | 106 | */ |
| 107 | - public int updateRoleStatus(SysRole role); | 107 | + int updateRoleStatus(SysRole role); |
| 108 | 108 | ||
| 109 | /** | 109 | /** |
| 110 | * 修改数据权限信息 | 110 | * 修改数据权限信息 |
| @@ -112,7 +112,7 @@ public interface ISysRoleService | @@ -112,7 +112,7 @@ public interface ISysRoleService | ||
| 112 | * @param role 角色信息 | 112 | * @param role 角色信息 |
| 113 | * @return 结果 | 113 | * @return 结果 |
| 114 | */ | 114 | */ |
| 115 | - public int authDataScope(SysRole role); | 115 | + int authDataScope(SysRole role); |
| 116 | 116 | ||
| 117 | /** | 117 | /** |
| 118 | * 通过角色ID删除角色 | 118 | * 通过角色ID删除角色 |
| @@ -120,7 +120,7 @@ public interface ISysRoleService | @@ -120,7 +120,7 @@ public interface ISysRoleService | ||
| 120 | * @param roleId 角色ID | 120 | * @param roleId 角色ID |
| 121 | * @return 结果 | 121 | * @return 结果 |
| 122 | */ | 122 | */ |
| 123 | - public int deleteRoleById(Long roleId); | 123 | + int deleteRoleById(Long roleId); |
| 124 | 124 | ||
| 125 | /** | 125 | /** |
| 126 | * 批量删除角色信息 | 126 | * 批量删除角色信息 |
| @@ -128,5 +128,5 @@ public interface ISysRoleService | @@ -128,5 +128,5 @@ public interface ISysRoleService | ||
| 128 | * @param roleIds 需要删除的角色ID | 128 | * @param roleIds 需要删除的角色ID |
| 129 | * @return 结果 | 129 | * @return 结果 |
| 130 | */ | 130 | */ |
| 131 | - public int deleteRoleByIds(Long[] roleIds); | 131 | + int deleteRoleByIds(Long[] roleIds); |
| 132 | } | 132 | } |
trash-system/src/main/java/com/trash/system/service/ISysUserOnlineService.java
| @@ -17,7 +17,7 @@ public interface ISysUserOnlineService | @@ -17,7 +17,7 @@ public interface ISysUserOnlineService | ||
| 17 | * @param user 用户信息 | 17 | * @param user 用户信息 |
| 18 | * @return 在线用户信息 | 18 | * @return 在线用户信息 |
| 19 | */ | 19 | */ |
| 20 | - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); | 20 | + SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 通过用户名称查询信息 | 23 | * 通过用户名称查询信息 |
| @@ -26,7 +26,7 @@ public interface ISysUserOnlineService | @@ -26,7 +26,7 @@ public interface ISysUserOnlineService | ||
| 26 | * @param user 用户信息 | 26 | * @param user 用户信息 |
| 27 | * @return 在线用户信息 | 27 | * @return 在线用户信息 |
| 28 | */ | 28 | */ |
| 29 | - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); | 29 | + SysUserOnline selectOnlineByUserName(String userName, LoginUser user); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 通过登录地址/用户名称查询信息 | 32 | * 通过登录地址/用户名称查询信息 |
| @@ -36,7 +36,7 @@ public interface ISysUserOnlineService | @@ -36,7 +36,7 @@ public interface ISysUserOnlineService | ||
| 36 | * @param user 用户信息 | 36 | * @param user 用户信息 |
| 37 | * @return 在线用户信息 | 37 | * @return 在线用户信息 |
| 38 | */ | 38 | */ |
| 39 | - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); | 39 | + SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 设置在线用户信息 | 42 | * 设置在线用户信息 |
| @@ -44,5 +44,5 @@ public interface ISysUserOnlineService | @@ -44,5 +44,5 @@ public interface ISysUserOnlineService | ||
| 44 | * @param user 用户信息 | 44 | * @param user 用户信息 |
| 45 | * @return 在线用户 | 45 | * @return 在线用户 |
| 46 | */ | 46 | */ |
| 47 | - public SysUserOnline loginUserToUserOnline(LoginUser user); | 47 | + SysUserOnline loginUserToUserOnline(LoginUser user); |
| 48 | } | 48 | } |
trash-system/src/main/java/com/trash/system/service/ISysUserService.java
| @@ -17,7 +17,7 @@ public interface ISysUserService | @@ -17,7 +17,7 @@ public interface ISysUserService | ||
| 17 | * @param user 用户信息 | 17 | * @param user 用户信息 |
| 18 | * @return 用户信息集合信息 | 18 | * @return 用户信息集合信息 |
| 19 | */ | 19 | */ |
| 20 | - public List<SysUser> selectUserList(SysUser user); | 20 | + List<SysUser> selectUserList(SysUser user); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 通过用户名查询用户 | 23 | * 通过用户名查询用户 |
| @@ -25,7 +25,7 @@ public interface ISysUserService | @@ -25,7 +25,7 @@ public interface ISysUserService | ||
| 25 | * @param userName 用户名 | 25 | * @param userName 用户名 |
| 26 | * @return 用户对象信息 | 26 | * @return 用户对象信息 |
| 27 | */ | 27 | */ |
| 28 | - public SysUser selectUserByUserName(String userName); | 28 | + SysUser selectUserByUserName(String userName); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 通过用户ID查询用户 | 31 | * 通过用户ID查询用户 |
| @@ -33,7 +33,7 @@ public interface ISysUserService | @@ -33,7 +33,7 @@ public interface ISysUserService | ||
| 33 | * @param userId 用户ID | 33 | * @param userId 用户ID |
| 34 | * @return 用户对象信息 | 34 | * @return 用户对象信息 |
| 35 | */ | 35 | */ |
| 36 | - public SysUser selectUserById(String userId); | 36 | + SysUser selectUserById(String userId); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 根据用户ID查询用户所属角色组 | 39 | * 根据用户ID查询用户所属角色组 |
| @@ -41,7 +41,7 @@ public interface ISysUserService | @@ -41,7 +41,7 @@ public interface ISysUserService | ||
| 41 | * @param userName 用户名 | 41 | * @param userName 用户名 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public String selectUserRoleGroup(String userName); | 44 | + String selectUserRoleGroup(String userName); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 根据用户ID查询用户所属岗位组 | 47 | * 根据用户ID查询用户所属岗位组 |
| @@ -49,7 +49,7 @@ public interface ISysUserService | @@ -49,7 +49,7 @@ public interface ISysUserService | ||
| 49 | * @param userName 用户名 | 49 | * @param userName 用户名 |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public String selectUserPostGroup(String userName); | 52 | + String selectUserPostGroup(String userName); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 校验用户名称是否唯一 | 55 | * 校验用户名称是否唯一 |
| @@ -57,7 +57,7 @@ public interface ISysUserService | @@ -57,7 +57,7 @@ public interface ISysUserService | ||
| 57 | * @param userName 用户名称 | 57 | * @param userName 用户名称 |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public String checkUserNameUnique(String userName); | 60 | + String checkUserNameUnique(String userName); |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
| 63 | * 校验手机号码是否唯一 | 63 | * 校验手机号码是否唯一 |
| @@ -65,7 +65,7 @@ public interface ISysUserService | @@ -65,7 +65,7 @@ public interface ISysUserService | ||
| 65 | * @param user 用户信息 | 65 | * @param user 用户信息 |
| 66 | * @return 结果 | 66 | * @return 结果 |
| 67 | */ | 67 | */ |
| 68 | - public String checkPhoneUnique(SysUser user); | 68 | + String checkPhoneUnique(SysUser user); |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * 校验email是否唯一 | 71 | * 校验email是否唯一 |
| @@ -73,15 +73,15 @@ public interface ISysUserService | @@ -73,15 +73,15 @@ public interface ISysUserService | ||
| 73 | * @param user 用户信息 | 73 | * @param user 用户信息 |
| 74 | * @return 结果 | 74 | * @return 结果 |
| 75 | */ | 75 | */ |
| 76 | - public String checkEmailUnique(SysUser user); | 76 | + String checkEmailUnique(SysUser user); |
| 77 | 77 | ||
| 78 | - public List<String>selectUserNameByPostCodeAndDeptId(String postCode,Long deptId); | 78 | + List<String>selectUserNameByPostCodeAndDeptId(String postCode, Long deptId); |
| 79 | /** | 79 | /** |
| 80 | * 校验用户是否允许操作 | 80 | * 校验用户是否允许操作 |
| 81 | * | 81 | * |
| 82 | * @param user 用户信息 | 82 | * @param user 用户信息 |
| 83 | */ | 83 | */ |
| 84 | - public void checkUserAllowed(SysUser user); | 84 | + void checkUserAllowed(SysUser user); |
| 85 | 85 | ||
| 86 | /** | 86 | /** |
| 87 | * 新增用户信息 | 87 | * 新增用户信息 |
| @@ -89,7 +89,7 @@ public interface ISysUserService | @@ -89,7 +89,7 @@ public interface ISysUserService | ||
| 89 | * @param user 用户信息 | 89 | * @param user 用户信息 |
| 90 | * @return 结果 | 90 | * @return 结果 |
| 91 | */ | 91 | */ |
| 92 | - public int insertUser(SysUser user); | 92 | + int insertUser(SysUser user); |
| 93 | 93 | ||
| 94 | /** | 94 | /** |
| 95 | * 修改用户信息 | 95 | * 修改用户信息 |
| @@ -97,7 +97,7 @@ public interface ISysUserService | @@ -97,7 +97,7 @@ public interface ISysUserService | ||
| 97 | * @param user 用户信息 | 97 | * @param user 用户信息 |
| 98 | * @return 结果 | 98 | * @return 结果 |
| 99 | */ | 99 | */ |
| 100 | - public int updateUser(SysUser user); | 100 | + int updateUser(SysUser user); |
| 101 | 101 | ||
| 102 | /** | 102 | /** |
| 103 | * 修改用户状态 | 103 | * 修改用户状态 |
| @@ -105,7 +105,7 @@ public interface ISysUserService | @@ -105,7 +105,7 @@ public interface ISysUserService | ||
| 105 | * @param user 用户信息 | 105 | * @param user 用户信息 |
| 106 | * @return 结果 | 106 | * @return 结果 |
| 107 | */ | 107 | */ |
| 108 | - public int updateUserStatus(SysUser user); | 108 | + int updateUserStatus(SysUser user); |
| 109 | 109 | ||
| 110 | /** | 110 | /** |
| 111 | * 修改用户基本信息 | 111 | * 修改用户基本信息 |
| @@ -113,7 +113,7 @@ public interface ISysUserService | @@ -113,7 +113,7 @@ public interface ISysUserService | ||
| 113 | * @param user 用户信息 | 113 | * @param user 用户信息 |
| 114 | * @return 结果 | 114 | * @return 结果 |
| 115 | */ | 115 | */ |
| 116 | - public int updateUserProfile(SysUser user); | 116 | + int updateUserProfile(SysUser user); |
| 117 | 117 | ||
| 118 | /** | 118 | /** |
| 119 | * 修改用户头像 | 119 | * 修改用户头像 |
| @@ -122,7 +122,7 @@ public interface ISysUserService | @@ -122,7 +122,7 @@ public interface ISysUserService | ||
| 122 | * @param avatar 头像地址 | 122 | * @param avatar 头像地址 |
| 123 | * @return 结果 | 123 | * @return 结果 |
| 124 | */ | 124 | */ |
| 125 | - public boolean updateUserAvatar(String userName, String avatar); | 125 | + boolean updateUserAvatar(String userName, String avatar); |
| 126 | 126 | ||
| 127 | /** | 127 | /** |
| 128 | * 重置用户密码 | 128 | * 重置用户密码 |
| @@ -130,7 +130,7 @@ public interface ISysUserService | @@ -130,7 +130,7 @@ public interface ISysUserService | ||
| 130 | * @param user 用户信息 | 130 | * @param user 用户信息 |
| 131 | * @return 结果 | 131 | * @return 结果 |
| 132 | */ | 132 | */ |
| 133 | - public int resetPwd(SysUser user); | 133 | + int resetPwd(SysUser user); |
| 134 | 134 | ||
| 135 | /** | 135 | /** |
| 136 | * 重置用户密码 | 136 | * 重置用户密码 |
| @@ -139,7 +139,7 @@ public interface ISysUserService | @@ -139,7 +139,7 @@ public interface ISysUserService | ||
| 139 | * @param password 密码 | 139 | * @param password 密码 |
| 140 | * @return 结果 | 140 | * @return 结果 |
| 141 | */ | 141 | */ |
| 142 | - public int resetUserPwd(String userName, String password); | 142 | + int resetUserPwd(String userName, String password); |
| 143 | 143 | ||
| 144 | /** | 144 | /** |
| 145 | * 通过用户ID删除用户 | 145 | * 通过用户ID删除用户 |
| @@ -147,7 +147,7 @@ public interface ISysUserService | @@ -147,7 +147,7 @@ public interface ISysUserService | ||
| 147 | * @param userId 用户ID | 147 | * @param userId 用户ID |
| 148 | * @return 结果 | 148 | * @return 结果 |
| 149 | */ | 149 | */ |
| 150 | - public int deleteUserById(String userId); | 150 | + int deleteUserById(String userId); |
| 151 | 151 | ||
| 152 | /** | 152 | /** |
| 153 | * 批量删除用户信息 | 153 | * 批量删除用户信息 |
| @@ -155,7 +155,7 @@ public interface ISysUserService | @@ -155,7 +155,7 @@ public interface ISysUserService | ||
| 155 | * @param userIds 需要删除的用户ID | 155 | * @param userIds 需要删除的用户ID |
| 156 | * @return 结果 | 156 | * @return 结果 |
| 157 | */ | 157 | */ |
| 158 | - public int deleteUserByIds(String[] userIds); | 158 | + int deleteUserByIds(String[] userIds); |
| 159 | 159 | ||
| 160 | /** | 160 | /** |
| 161 | * 导入用户数据 | 161 | * 导入用户数据 |
| @@ -165,5 +165,5 @@ public interface ISysUserService | @@ -165,5 +165,5 @@ public interface ISysUserService | ||
| 165 | * @param operName 操作用户 | 165 | * @param operName 操作用户 |
| 166 | * @return 结果 | 166 | * @return 结果 |
| 167 | */ | 167 | */ |
| 168 | - public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); | 168 | + String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); |
| 169 | } | 169 | } |
trash-system/src/main/java/com/trash/system/service/impl/SysDeptServiceImpl.java
| @@ -62,7 +62,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -62,7 +62,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 62 | } | 62 | } |
| 63 | for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();) | 63 | for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();) |
| 64 | { | 64 | { |
| 65 | - SysDept dept = (SysDept) iterator.next(); | 65 | + SysDept dept = iterator.next(); |
| 66 | // 如果是顶级节点, 遍历该父节点的所有子节点 | 66 | // 如果是顶级节点, 遍历该父节点的所有子节点 |
| 67 | if (!tempList.contains(dept.getParentId())) | 67 | if (!tempList.contains(dept.getParentId())) |
| 68 | { | 68 | { |
| @@ -137,7 +137,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -137,7 +137,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 137 | public boolean hasChildByDeptId(Long deptId) | 137 | public boolean hasChildByDeptId(Long deptId) |
| 138 | { | 138 | { |
| 139 | int result = deptMapper.hasChildByDeptId(deptId); | 139 | int result = deptMapper.hasChildByDeptId(deptId); |
| 140 | - return result > 0 ? true : false; | 140 | + return result > 0; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | /** | 143 | /** |
| @@ -150,7 +150,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -150,7 +150,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 150 | public boolean checkDeptExistUser(Long deptId) | 150 | public boolean checkDeptExistUser(Long deptId) |
| 151 | { | 151 | { |
| 152 | int result = deptMapper.checkDeptExistUser(deptId); | 152 | int result = deptMapper.checkDeptExistUser(deptId); |
| 153 | - return result > 0 ? true : false; | 153 | + return result > 0; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | /** | 156 | /** |
| @@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 288 | Iterator<SysDept> it = list.iterator(); | 288 | Iterator<SysDept> it = list.iterator(); |
| 289 | while (it.hasNext()) | 289 | while (it.hasNext()) |
| 290 | { | 290 | { |
| 291 | - SysDept n = (SysDept) it.next(); | 291 | + SysDept n = it.next(); |
| 292 | if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) | 292 | if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) |
| 293 | { | 293 | { |
| 294 | tlist.add(n); | 294 | tlist.add(n); |
| @@ -302,6 +302,6 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -302,6 +302,6 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 302 | */ | 302 | */ |
| 303 | private boolean hasChild(List<SysDept> list, SysDept t) | 303 | private boolean hasChild(List<SysDept> list, SysDept t) |
| 304 | { | 304 | { |
| 305 | - return getChildList(list, t).size() > 0 ? true : false; | 305 | + return getChildList(list, t).size() > 0; |
| 306 | } | 306 | } |
| 307 | } | 307 | } |
trash-system/src/main/java/com/trash/system/service/impl/SysMenuServiceImpl.java
| @@ -208,7 +208,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -208,7 +208,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 208 | } | 208 | } |
| 209 | for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();) | 209 | for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();) |
| 210 | { | 210 | { |
| 211 | - SysMenu menu = (SysMenu) iterator.next(); | 211 | + SysMenu menu = iterator.next(); |
| 212 | // 如果是顶级节点, 遍历该父节点的所有子节点 | 212 | // 如果是顶级节点, 遍历该父节点的所有子节点 |
| 213 | if (!tempList.contains(menu.getParentId())) | 213 | if (!tempList.contains(menu.getParentId())) |
| 214 | { | 214 | { |
| @@ -258,7 +258,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -258,7 +258,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 258 | public boolean hasChildByMenuId(Long menuId) | 258 | public boolean hasChildByMenuId(Long menuId) |
| 259 | { | 259 | { |
| 260 | int result = menuMapper.hasChildByMenuId(menuId); | 260 | int result = menuMapper.hasChildByMenuId(menuId); |
| 261 | - return result > 0 ? true : false; | 261 | + return result > 0; |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | /** | 264 | /** |
| @@ -271,7 +271,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -271,7 +271,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 271 | public boolean checkMenuExistRole(Long menuId) | 271 | public boolean checkMenuExistRole(Long menuId) |
| 272 | { | 272 | { |
| 273 | int result = roleMenuMapper.checkMenuExistRole(menuId); | 273 | int result = roleMenuMapper.checkMenuExistRole(menuId); |
| 274 | - return result > 0 ? true : false; | 274 | + return result > 0; |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | /** | 277 | /** |
| @@ -408,7 +408,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -408,7 +408,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 408 | List<SysMenu> returnList = new ArrayList<SysMenu>(); | 408 | List<SysMenu> returnList = new ArrayList<SysMenu>(); |
| 409 | for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();) | 409 | for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();) |
| 410 | { | 410 | { |
| 411 | - SysMenu t = (SysMenu) iterator.next(); | 411 | + SysMenu t = iterator.next(); |
| 412 | // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 | 412 | // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 |
| 413 | if (t.getParentId() == parentId) | 413 | if (t.getParentId() == parentId) |
| 414 | { | 414 | { |
| @@ -448,7 +448,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -448,7 +448,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 448 | Iterator<SysMenu> it = list.iterator(); | 448 | Iterator<SysMenu> it = list.iterator(); |
| 449 | while (it.hasNext()) | 449 | while (it.hasNext()) |
| 450 | { | 450 | { |
| 451 | - SysMenu n = (SysMenu) it.next(); | 451 | + SysMenu n = it.next(); |
| 452 | if (n.getParentId().longValue() == t.getMenuId().longValue()) | 452 | if (n.getParentId().longValue() == t.getMenuId().longValue()) |
| 453 | { | 453 | { |
| 454 | tlist.add(n); | 454 | tlist.add(n); |
| @@ -462,6 +462,6 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -462,6 +462,6 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 462 | */ | 462 | */ |
| 463 | private boolean hasChild(List<SysMenu> list, SysMenu t) | 463 | private boolean hasChild(List<SysMenu> list, SysMenu t) |
| 464 | { | 464 | { |
| 465 | - return getChildList(list, t).size() > 0 ? true : false; | 465 | + return getChildList(list, t).size() > 0; |
| 466 | } | 466 | } |
| 467 | } | 467 | } |
trash-ui/src/api/casefile/violationWarningInformation.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +// 查询违规预警信息列表 | ||
| 4 | +export function listViolationWarningInformation(query) { | ||
| 5 | + return request({ | ||
| 6 | + url: '/casefile/violationWarningInformation/list', | ||
| 7 | + method: 'get', | ||
| 8 | + params: query | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +// 查询违规预警信息详细 | ||
| 13 | +export function getViolationWarningInformation(id) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/casefile/violationWarningInformation/' + id, | ||
| 16 | + method: 'get' | ||
| 17 | + }) | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +// 新增违规预警信息 | ||
| 21 | +export function addViolationWarningInformation(data) { | ||
| 22 | + return request({ | ||
| 23 | + url: '/casefile/violationWarningInformation', | ||
| 24 | + method: 'post', | ||
| 25 | + data: data | ||
| 26 | + }) | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +// 修改违规预警信息 | ||
| 30 | +export function updateViolationWarningInformation(data) { | ||
| 31 | + return request({ | ||
| 32 | + url: '/casefile/violationWarningInformation', | ||
| 33 | + method: 'put', | ||
| 34 | + data: data | ||
| 35 | + }) | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +// 删除违规预警信息 | ||
| 39 | +export function delViolationWarningInformation(id) { | ||
| 40 | + return request({ | ||
| 41 | + url: '/casefile/violationWarningInformation/' + id, | ||
| 42 | + method: 'delete' | ||
| 43 | + }) | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +// 导出违规预警信息 | ||
| 47 | +export function exportViolationWarningInformation(query) { | ||
| 48 | + return request({ | ||
| 49 | + url: '/casefile/violationWarningInformation/export', | ||
| 50 | + method: 'get', | ||
| 51 | + params: query | ||
| 52 | + }) | ||
| 53 | +} |
trash-ui/src/api/office/conference.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +// 查询会议管理列表 | ||
| 4 | +export function listConference(query) { | ||
| 5 | + return request({ | ||
| 6 | + url: '/office/conference/list', | ||
| 7 | + method: 'get', | ||
| 8 | + params: query | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +// 查询会议管理详细 | ||
| 13 | +export function getConference(id) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/office/conference/' + id, | ||
| 16 | + method: 'get' | ||
| 17 | + }) | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +// 新增会议管理 | ||
| 21 | +export function addConference(data) { | ||
| 22 | + return request({ | ||
| 23 | + url: '/office/conference', | ||
| 24 | + method: 'post', | ||
| 25 | + data: data | ||
| 26 | + }) | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +// 修改会议管理 | ||
| 30 | +export function updateConference(data) { | ||
| 31 | + return request({ | ||
| 32 | + url: '/office/conference', | ||
| 33 | + method: 'put', | ||
| 34 | + data: data | ||
| 35 | + }) | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +// 删除会议管理 | ||
| 39 | +export function delConference(id) { | ||
| 40 | + return request({ | ||
| 41 | + url: '/office/conference/' + id, | ||
| 42 | + method: 'delete' | ||
| 43 | + }) | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +// 导出会议管理 | ||
| 47 | +export function exportConference(query) { | ||
| 48 | + return request({ | ||
| 49 | + url: '/office/conference/export', | ||
| 50 | + method: 'get', | ||
| 51 | + params: query | ||
| 52 | + }) | ||
| 53 | +} |
trash-ui/src/api/office/handle.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +// 查询办文办事列表 | ||
| 4 | +export function listHandle(query) { | ||
| 5 | + return request({ | ||
| 6 | + url: '/office/handle/list', | ||
| 7 | + method: 'get', | ||
| 8 | + params: query | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +// 查询办文办事详细 | ||
| 13 | +export function getHandle(id) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/office/handle/' + id, | ||
| 16 | + method: 'get' | ||
| 17 | + }) | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +// 新增办文办事 | ||
| 21 | +export function addHandle(data) { | ||
| 22 | + return request({ | ||
| 23 | + url: '/office/handle', | ||
| 24 | + method: 'post', | ||
| 25 | + data: data | ||
| 26 | + }) | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +// 修改办文办事 | ||
| 30 | +export function updateHandle(data) { | ||
| 31 | + return request({ | ||
| 32 | + url: '/office/handle', | ||
| 33 | + method: 'put', | ||
| 34 | + data: data | ||
| 35 | + }) | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +// 删除办文办事 | ||
| 39 | +export function delHandle(id) { | ||
| 40 | + return request({ | ||
| 41 | + url: '/office/handle/' + id, | ||
| 42 | + method: 'delete' | ||
| 43 | + }) | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +// 导出办文办事 | ||
| 47 | +export function exportHandle(query) { | ||
| 48 | + return request({ | ||
| 49 | + url: '/office/handle/export', | ||
| 50 | + method: 'get', | ||
| 51 | + params: query | ||
| 52 | + }) | ||
| 53 | +} |
trash-ui/src/api/office/leaveApplication.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +// 查询leaveApplication列表 | ||
| 4 | +export function listLeaveApplication(query) { | ||
| 5 | + return request({ | ||
| 6 | + url: '/office/leaveApplication/list', | ||
| 7 | + method: 'get', | ||
| 8 | + params: query | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +// 查询leaveApplication详细 | ||
| 13 | +export function getLeaveApplication(id) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/office/leaveApplication/' + id, | ||
| 16 | + method: 'get' | ||
| 17 | + }) | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +// 新增leaveApplication | ||
| 21 | +export function addLeaveApplication(data) { | ||
| 22 | + return request({ | ||
| 23 | + url: '/office/leaveApplication', | ||
| 24 | + method: 'post', | ||
| 25 | + data: data | ||
| 26 | + }) | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +// 修改leaveApplication | ||
| 30 | +export function updateLeaveApplication(data) { | ||
| 31 | + return request({ | ||
| 32 | + url: '/office/leaveApplication', | ||
| 33 | + method: 'put', | ||
| 34 | + data: data | ||
| 35 | + }) | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +// 删除leaveApplication | ||
| 39 | +export function delLeaveApplication(id) { | ||
| 40 | + return request({ | ||
| 41 | + url: '/office/leaveApplication/' + id, | ||
| 42 | + method: 'delete' | ||
| 43 | + }) | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +// 导出leaveApplication | ||
| 47 | +export function exportLeaveApplication(query) { | ||
| 48 | + return request({ | ||
| 49 | + url: '/office/leaveApplication/export', | ||
| 50 | + method: 'get', | ||
| 51 | + params: query | ||
| 52 | + }) | ||
| 53 | +} |
trash-ui/src/api/office/logistics.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +// 查询后勤管理列表 | ||
| 4 | +export function listLogistics(query) { | ||
| 5 | + return request({ | ||
| 6 | + url: '/office/logistics/list', | ||
| 7 | + method: 'get', | ||
| 8 | + params: query | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +// 查询后勤管理详细 | ||
| 13 | +export function getLogistics(id) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/office/logistics/' + id, | ||
| 16 | + method: 'get' | ||
| 17 | + }) | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +// 新增后勤管理 | ||
| 21 | +export function addLogistics(data) { | ||
| 22 | + return request({ | ||
| 23 | + url: '/office/logistics', | ||
| 24 | + method: 'post', | ||
| 25 | + data: data | ||
| 26 | + }) | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +// 修改后勤管理 | ||
| 30 | +export function updateLogistics(data) { | ||
| 31 | + return request({ | ||
| 32 | + url: '/office/logistics', | ||
| 33 | + method: 'put', | ||
| 34 | + data: data | ||
| 35 | + }) | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +// 删除后勤管理 | ||
| 39 | +export function delLogistics(id) { | ||
| 40 | + return request({ | ||
| 41 | + url: '/office/logistics/' + id, | ||
| 42 | + method: 'delete' | ||
| 43 | + }) | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +// 导出后勤管理 | ||
| 47 | +export function exportLogistics(query) { | ||
| 48 | + return request({ | ||
| 49 | + url: '/office/logistics/export', | ||
| 50 | + method: 'get', | ||
| 51 | + params: query | ||
| 52 | + }) | ||
| 53 | +} |
trash-ui/src/components/ZcEditor/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="editor" ref="editor" :style="styles"></div> | ||
| 3 | +</template> | ||
| 4 | + | ||
| 5 | +<script> | ||
| 6 | +import Quill from "quill"; | ||
| 7 | +import "quill/dist/quill.core.css"; | ||
| 8 | +import "quill/dist/quill.snow.css"; | ||
| 9 | +import "quill/dist/quill.bubble.css"; | ||
| 10 | + | ||
| 11 | +export default { | ||
| 12 | + name: "Editor", | ||
| 13 | + props: { | ||
| 14 | + /* 编辑器的内容 */ | ||
| 15 | + value: { | ||
| 16 | + type: String, | ||
| 17 | + default: "", | ||
| 18 | + }, | ||
| 19 | + /* 高度 */ | ||
| 20 | + height: { | ||
| 21 | + type: Number, | ||
| 22 | + default: null, | ||
| 23 | + }, | ||
| 24 | + /* 最小高度 */ | ||
| 25 | + minHeight: { | ||
| 26 | + type: Number, | ||
| 27 | + default: null, | ||
| 28 | + }, | ||
| 29 | + isReadOnly: { | ||
| 30 | + type: Boolean, | ||
| 31 | + default: false, | ||
| 32 | + }, | ||
| 33 | + }, | ||
| 34 | + data() { | ||
| 35 | + return { | ||
| 36 | + Quill: null, | ||
| 37 | + currentValue: "", | ||
| 38 | + options: { | ||
| 39 | + theme: "snow", | ||
| 40 | + bounds: document.body, | ||
| 41 | + debug: "warn", | ||
| 42 | + modules: { | ||
| 43 | + // 工具栏配置 | ||
| 44 | + toolbar: [ | ||
| 45 | + ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 | ||
| 46 | + [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表 | ||
| 47 | + [{ indent: '-1' }, { indent: '+1' }], // 缩进 | ||
| 48 | + [{ direction: 'rtl' }], // 文本方向 | ||
| 49 | + [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 | ||
| 50 | + [{ align: [] }], // 对齐方式 | ||
| 51 | + ['clean'], // 清除文本格式 | ||
| 52 | + ], | ||
| 53 | + }, | ||
| 54 | + placeholder: "请输入内容", | ||
| 55 | + readOnly: false, | ||
| 56 | + }, | ||
| 57 | + }; | ||
| 58 | + }, | ||
| 59 | + computed: { | ||
| 60 | + styles() { | ||
| 61 | + let style = {}; | ||
| 62 | + if (this.minHeight) { | ||
| 63 | + style.minHeight = `${this.minHeight}px`; | ||
| 64 | + } | ||
| 65 | + if (this.height) { | ||
| 66 | + style.height = `${this.height}px`; | ||
| 67 | + } | ||
| 68 | + return style; | ||
| 69 | + }, | ||
| 70 | + }, | ||
| 71 | + watch: { | ||
| 72 | + value: { | ||
| 73 | + handler(val) { | ||
| 74 | + if (val !== this.currentValue) { | ||
| 75 | + this.currentValue = val === null ? "" : val; | ||
| 76 | + if (this.Quill) { | ||
| 77 | + this.Quill.pasteHTML(this.currentValue); | ||
| 78 | + } | ||
| 79 | + } | ||
| 80 | + }, | ||
| 81 | + immediate: true, | ||
| 82 | + }, | ||
| 83 | + }, | ||
| 84 | + mounted() { | ||
| 85 | + this.init(); | ||
| 86 | + }, | ||
| 87 | + beforeDestroy() { | ||
| 88 | + this.Quill = null; | ||
| 89 | + }, | ||
| 90 | + methods: { | ||
| 91 | + init() { | ||
| 92 | + const editor = this.$refs.editor; | ||
| 93 | + this.Quill = new Quill(editor, this.options); | ||
| 94 | + if(this.isReadOnly){ | ||
| 95 | + this.Quill.enable(false); | ||
| 96 | + } | ||
| 97 | + this.Quill.pasteHTML(this.currentValue); | ||
| 98 | + this.Quill.on("text-change", (delta, oldDelta, source) => { | ||
| 99 | + const html = this.$refs.editor.children[0].innerHTML; | ||
| 100 | + const text = this.Quill.getText(); | ||
| 101 | + const quill = this.Quill; | ||
| 102 | + this.currentValue = html; | ||
| 103 | + this.$emit("input", html); | ||
| 104 | + this.$emit("on-change", { html, text, quill }); | ||
| 105 | + }); | ||
| 106 | + this.Quill.on("text-change", (delta, oldDelta, source) => { | ||
| 107 | + this.$emit("on-text-change", delta, oldDelta, source); | ||
| 108 | + }); | ||
| 109 | + this.Quill.on("selection-change", (range, oldRange, source) => { | ||
| 110 | + this.$emit("on-selection-change", range, oldRange, source); | ||
| 111 | + }); | ||
| 112 | + this.Quill.on("editor-change", (eventName, ...args) => { | ||
| 113 | + this.$emit("on-editor-change", eventName, ...args); | ||
| 114 | + }); | ||
| 115 | + }, | ||
| 116 | + }, | ||
| 117 | +}; | ||
| 118 | +</script> | ||
| 119 | + | ||
| 120 | +<style> | ||
| 121 | +.editor, .ql-toolbar { | ||
| 122 | + white-space: pre-wrap!important; | ||
| 123 | + line-height: normal !important; | ||
| 124 | +} | ||
| 125 | +.quill-img { | ||
| 126 | + display: none; | ||
| 127 | +} | ||
| 128 | +.ql-snow .ql-tooltip[data-mode="link"]::before { | ||
| 129 | + content: "请输入链接地址:"; | ||
| 130 | +} | ||
| 131 | +.ql-snow .ql-tooltip.ql-editing a.ql-action::after { | ||
| 132 | + border-right: 0px; | ||
| 133 | + content: "保存"; | ||
| 134 | + padding-right: 0px; | ||
| 135 | +} | ||
| 136 | + | ||
| 137 | +.ql-snow .ql-tooltip[data-mode="video"]::before { | ||
| 138 | + content: "请输入视频地址:"; | ||
| 139 | +} | ||
| 140 | + | ||
| 141 | +.ql-snow .ql-picker.ql-size .ql-picker-label::before, | ||
| 142 | +.ql-snow .ql-picker.ql-size .ql-picker-item::before { | ||
| 143 | + content: "14px"; | ||
| 144 | +} | ||
| 145 | +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before, | ||
| 146 | +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before { | ||
| 147 | + content: "10px"; | ||
| 148 | +} | ||
| 149 | +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before, | ||
| 150 | +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before { | ||
| 151 | + content: "18px"; | ||
| 152 | +} | ||
| 153 | +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before, | ||
| 154 | +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before { | ||
| 155 | + content: "32px"; | ||
| 156 | +} | ||
| 157 | + | ||
| 158 | +.ql-snow .ql-picker.ql-header .ql-picker-label::before, | ||
| 159 | +.ql-snow .ql-picker.ql-header .ql-picker-item::before { | ||
| 160 | + content: "文本"; | ||
| 161 | +} | ||
| 162 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before, | ||
| 163 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before { | ||
| 164 | + content: "标题1"; | ||
| 165 | +} | ||
| 166 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before, | ||
| 167 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before { | ||
| 168 | + content: "标题2"; | ||
| 169 | +} | ||
| 170 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before, | ||
| 171 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before { | ||
| 172 | + content: "标题3"; | ||
| 173 | +} | ||
| 174 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before, | ||
| 175 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before { | ||
| 176 | + content: "标题4"; | ||
| 177 | +} | ||
| 178 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before, | ||
| 179 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before { | ||
| 180 | + content: "标题5"; | ||
| 181 | +} | ||
| 182 | +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before, | ||
| 183 | +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before { | ||
| 184 | + content: "标题6"; | ||
| 185 | +} | ||
| 186 | + | ||
| 187 | +.ql-snow .ql-picker.ql-font .ql-picker-label::before, | ||
| 188 | +.ql-snow .ql-picker.ql-font .ql-picker-item::before { | ||
| 189 | + content: "标准字体"; | ||
| 190 | +} | ||
| 191 | +.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before, | ||
| 192 | +.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before { | ||
| 193 | + content: "衬线字体"; | ||
| 194 | +} | ||
| 195 | +.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before, | ||
| 196 | +.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before { | ||
| 197 | + content: "等宽字体"; | ||
| 198 | +} | ||
| 199 | +</style> |
trash-ui/src/main.js
| @@ -18,7 +18,7 @@ import './assets/icons' // icon | @@ -18,7 +18,7 @@ import './assets/icons' // icon | ||
| 18 | import './permission' // permission control | 18 | import './permission' // permission control |
| 19 | import { getDicts } from "@/api/system/dict/data"; | 19 | import { getDicts } from "@/api/system/dict/data"; |
| 20 | import { getConfigKey } from "@/api/system/config"; | 20 | import { getConfigKey } from "@/api/system/config"; |
| 21 | -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/trash"; | 21 | +import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree,parseStatus } from "@/utils/trash"; |
| 22 | import Pagination from "@/components/Pagination"; | 22 | import Pagination from "@/components/Pagination"; |
| 23 | //自定义表格工具扩展 | 23 | //自定义表格工具扩展 |
| 24 | import RightToolbar from "@/components/RightToolbar" | 24 | import RightToolbar from "@/components/RightToolbar" |
| @@ -33,6 +33,7 @@ Vue.prototype.selectDictLabel = selectDictLabel | @@ -33,6 +33,7 @@ Vue.prototype.selectDictLabel = selectDictLabel | ||
| 33 | Vue.prototype.selectDictLabels = selectDictLabels | 33 | Vue.prototype.selectDictLabels = selectDictLabels |
| 34 | Vue.prototype.download = download | 34 | Vue.prototype.download = download |
| 35 | Vue.prototype.handleTree = handleTree | 35 | Vue.prototype.handleTree = handleTree |
| 36 | +Vue.prototype.parseStatus = parseStatus | ||
| 36 | 37 | ||
| 37 | Vue.prototype.msgSuccess = function (msg) { | 38 | Vue.prototype.msgSuccess = function (msg) { |
| 38 | this.$message({ showClose: true, message: msg, type: "success" }); | 39 | this.$message({ showClose: true, message: msg, type: "success" }); |
trash-ui/src/router/index.js
| @@ -141,7 +141,7 @@ export const constantRoutes = [ | @@ -141,7 +141,7 @@ export const constantRoutes = [ | ||
| 141 | name: '日开工报表', | 141 | name: '日开工报表', |
| 142 | meta: { title: '日开工报表' } | 142 | meta: { title: '日开工报表' } |
| 143 | }, | 143 | }, |
| 144 | - | 144 | + |
| 145 | { | 145 | { |
| 146 | path: 'supervision/truckActivate', | 146 | path: 'supervision/truckActivate', |
| 147 | component: (resolve) => require(['@/views/business/truckActivate'], resolve), | 147 | component: (resolve) => require(['@/views/business/truckActivate'], resolve), |
| @@ -171,6 +171,12 @@ export const constantRoutes = [ | @@ -171,6 +171,12 @@ export const constantRoutes = [ | ||
| 171 | component: (resolve) => require(['@/views/business/DriverCredit'], resolve), | 171 | component: (resolve) => require(['@/views/business/DriverCredit'], resolve), |
| 172 | name: '驾驶员失信管理', | 172 | name: '驾驶员失信管理', |
| 173 | meta: { title: '驾驶员失信管理' } | 173 | meta: { title: '驾驶员失信管理' } |
| 174 | + }, | ||
| 175 | + { | ||
| 176 | + path: 'casefile/violationWarningInformation', | ||
| 177 | + component: (resolve) => require(['@/views/casefile/violationWarningInformation'], resolve), | ||
| 178 | + name: '违规预警信息', | ||
| 179 | + meta: { title: '违规预警信息' } | ||
| 174 | } | 180 | } |
| 175 | ] | 181 | ] |
| 176 | }, { | 182 | }, { |
| @@ -202,7 +208,7 @@ export const constantRoutes = [ | @@ -202,7 +208,7 @@ export const constantRoutes = [ | ||
| 202 | meta: { title: '工作月报' } | 208 | meta: { title: '工作月报' } |
| 203 | }, | 209 | }, |
| 204 | ] | 210 | ] |
| 205 | - } | 211 | + }, |
| 206 | ] | 212 | ] |
| 207 | 213 | ||
| 208 | export default new Router({ | 214 | export default new Router({ |
trash-ui/src/utils/trash.js
| @@ -146,3 +146,19 @@ export function handleTree(data, id, parentId, children, rootId) { | @@ -146,3 +146,19 @@ export function handleTree(data, id, parentId, children, rootId) { | ||
| 146 | }); | 146 | }); |
| 147 | return treeData != '' ? treeData : data; | 147 | return treeData != '' ? treeData : data; |
| 148 | } | 148 | } |
| 149 | + | ||
| 150 | +/** | ||
| 151 | + * 查询审批状态 | ||
| 152 | + * @param status | ||
| 153 | + * @returns {string} | ||
| 154 | + */ | ||
| 155 | +export function parseStatus(status) { | ||
| 156 | + if(status==1){ | ||
| 157 | + return "审核通过"; | ||
| 158 | + }else if(status==2){ | ||
| 159 | + return "被驳回"; | ||
| 160 | + }else{ | ||
| 161 | + return "审核中"; | ||
| 162 | + } | ||
| 163 | +} | ||
| 164 | + |
trash-ui/src/views/activiti/task/index.vue
| @@ -152,6 +152,28 @@ | @@ -152,6 +152,28 @@ | ||
| 152 | <el-dialog title="示意图" :visible.sync="picSample" append-to-body> | 152 | <el-dialog title="示意图" :visible.sync="picSample" append-to-body> |
| 153 | <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" /> | 153 | <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" /> |
| 154 | </el-dialog> | 154 | </el-dialog> |
| 155 | + | ||
| 156 | + <!-- 会议管理 --> | ||
| 157 | + <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body> | ||
| 158 | + <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/> | ||
| 159 | + <div slot="footer" class="dialog-footer"> | ||
| 160 | + <div slot="footer" class="dialog-footer"> | ||
| 161 | + <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button> | ||
| 162 | + <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button> | ||
| 163 | + </div> | ||
| 164 | + </div> | ||
| 165 | + </el-dialog> | ||
| 166 | + | ||
| 167 | + <!-- 请假申请 --> | ||
| 168 | + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body> | ||
| 169 | + <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/> | ||
| 170 | + <div slot="footer" class="dialog-footer"> | ||
| 171 | + <div slot="footer" class="dialog-footer"> | ||
| 172 | + <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button> | ||
| 173 | + <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button> | ||
| 174 | + </div> | ||
| 175 | + </div> | ||
| 176 | + </el-dialog> | ||
| 155 | </div> | 177 | </div> |
| 156 | </template> | 178 | </template> |
| 157 | 179 | ||
| @@ -182,14 +204,17 @@ | @@ -182,14 +204,17 @@ | ||
| 182 | import { | 204 | import { |
| 183 | getToken | 205 | getToken |
| 184 | } from "@/utils/auth"; | 206 | } from "@/utils/auth"; |
| 185 | - | 207 | + import conferenceInfo from "@/views/office/conference/conferenceInfo"; |
| 208 | + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo"; | ||
| 186 | 209 | ||
| 187 | export default { | 210 | export default { |
| 188 | name: "task", | 211 | name: "task", |
| 189 | components: { | 212 | components: { |
| 190 | taskCard, | 213 | taskCard, |
| 191 | leaveHistoryForm, | 214 | leaveHistoryForm, |
| 192 | - threestepInfo | 215 | + threestepInfo, |
| 216 | + conferenceInfo, | ||
| 217 | + leaveApplicationInfo | ||
| 193 | }, | 218 | }, |
| 194 | data() { | 219 | data() { |
| 195 | return { | 220 | return { |
| @@ -253,6 +278,9 @@ | @@ -253,6 +278,9 @@ | ||
| 253 | url: process.env.VUE_APP_BASE_API + "/business/threestep/upload", | 278 | url: process.env.VUE_APP_BASE_API + "/business/threestep/upload", |
| 254 | }, | 279 | }, |
| 255 | uploadImageDialog: false, | 280 | uploadImageDialog: false, |
| 281 | + conferenceOpen: false, | ||
| 282 | + idInfo:null, | ||
| 283 | + leaveApplicationOpen:false, | ||
| 256 | areas:{}, | 284 | areas:{}, |
| 257 | roles:[], | 285 | roles:[], |
| 258 | depts:{}, | 286 | depts:{}, |
| @@ -311,6 +339,8 @@ | @@ -311,6 +339,8 @@ | ||
| 311 | cancel() { | 339 | cancel() { |
| 312 | this.open = false; | 340 | this.open = false; |
| 313 | this.open2 = false; | 341 | this.open2 = false; |
| 342 | + this.leaveApplicationOpen= false; | ||
| 343 | + this.conferenceOpen = false; | ||
| 314 | this.reset(); | 344 | this.reset(); |
| 315 | }, | 345 | }, |
| 316 | // 表单重置 | 346 | // 表单重置 |
| @@ -357,6 +387,16 @@ | @@ -357,6 +387,16 @@ | ||
| 357 | this.open2 = true; | 387 | this.open2 = true; |
| 358 | return; | 388 | return; |
| 359 | } | 389 | } |
| 390 | + if(this.definitionKey == "conference"){ | ||
| 391 | + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1); | ||
| 392 | + this.conferenceOpen = true; | ||
| 393 | + return; | ||
| 394 | + } | ||
| 395 | + if(this.definitionKey == "workflow_leave"){ | ||
| 396 | + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1); | ||
| 397 | + this.leaveApplicationOpen = true; | ||
| 398 | + return; | ||
| 399 | + } | ||
| 360 | this.open = true; | 400 | this.open = true; |
| 361 | this.title = "审批"; | 401 | this.title = "审批"; |
| 362 | }); | 402 | }); |
| @@ -416,6 +456,37 @@ | @@ -416,6 +456,37 @@ | ||
| 416 | this.getList(); | 456 | this.getList(); |
| 417 | }); | 457 | }); |
| 418 | }, | 458 | }, |
| 459 | + conferenceSubmitForm(value){ | ||
| 460 | + return; | ||
| 461 | + this.form.formData[0].controlValue = value; | ||
| 462 | + if(value==0){ | ||
| 463 | + this.form.status = 1; | ||
| 464 | + }else{ | ||
| 465 | + this.form.status = 2; | ||
| 466 | + } | ||
| 467 | + //审批or驳回 | ||
| 468 | + formDataSave(this.id, this.form.formData).then(response => { | ||
| 469 | + this.msgSuccess("审批成功"); | ||
| 470 | + this.conferenceOpen = false; | ||
| 471 | + this.taskList = []; | ||
| 472 | + this.getList(); | ||
| 473 | + }); | ||
| 474 | + }, | ||
| 475 | + leaveApplicationSubmitForm(value){ | ||
| 476 | + if(value==0){ | ||
| 477 | + this.form.status = 1; | ||
| 478 | + }else{ | ||
| 479 | + this.form.status = 2; | ||
| 480 | + } | ||
| 481 | + this.form.formData[0].controlValue = value; | ||
| 482 | + //审批or驳回 | ||
| 483 | + formDataSave(this.id, this.form.formData).then(response => { | ||
| 484 | + this.msgSuccess("审批成功"); | ||
| 485 | + this.leaveApplicationOpen = false; | ||
| 486 | + this.taskList = []; | ||
| 487 | + this.getList(); | ||
| 488 | + }); | ||
| 489 | + } | ||
| 419 | } | 490 | } |
| 420 | }; | 491 | }; |
| 421 | </script> | 492 | </script> |
trash-ui/src/views/casefile/violationWarningInformation/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="app-container"> | ||
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px"> | ||
| 4 | + <el-form-item label="案卷编号" prop="number"> | ||
| 5 | + <el-input | ||
| 6 | + v-model="queryParams.number" | ||
| 7 | + placeholder="请输入案卷编号" | ||
| 8 | + clearable | ||
| 9 | + size="small" | ||
| 10 | + @keyup.enter.native="handleQuery" | ||
| 11 | + /> | ||
| 12 | + </el-form-item> | ||
| 13 | + <el-form-item label="违规对象类型" prop="violationObjectType"> | ||
| 14 | + <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small"> | ||
| 15 | + <el-option label="对象1" value="对象1" /> | ||
| 16 | + <el-option label="对象2" value="对象2" /> | ||
| 17 | + </el-select> | ||
| 18 | + </el-form-item> | ||
| 19 | + <el-form-item label="所属区域" prop="owningRegion"> | ||
| 20 | + <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small"> | ||
| 21 | + <el-option label="区域1" value="区域1" /> | ||
| 22 | + <el-option label="区域2" value="区域2" /> | ||
| 23 | + </el-select> | ||
| 24 | + </el-form-item> | ||
| 25 | + <el-form-item label="违规类型" prop="violationType"> | ||
| 26 | + <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small"> | ||
| 27 | + <el-option label="违规1" value="违规1" /> | ||
| 28 | + <el-option label="违规2" value="违规2" /> | ||
| 29 | + </el-select> | ||
| 30 | + </el-form-item> | ||
| 31 | + <el-form-item label="项目名称" prop="projectName"> | ||
| 32 | + <el-select v-model="queryParams.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"> | ||
| 33 | + <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option> | ||
| 34 | + </el-select> | ||
| 35 | + </el-form-item> | ||
| 36 | + <el-form-item label="企业名称" prop="companyName"> | ||
| 37 | + <el-select v-model="queryParams.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;"> | ||
| 38 | + <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option> | ||
| 39 | + </el-select> | ||
| 40 | + </el-form-item> | ||
| 41 | + <el-form-item> | ||
| 42 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||
| 43 | + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||
| 44 | + </el-form-item> | ||
| 45 | + </el-form> | ||
| 46 | + | ||
| 47 | + <el-row :gutter="10" class="mb8"> | ||
| 48 | + <el-col :span="1.5"> | ||
| 49 | + <el-button | ||
| 50 | + type="primary" | ||
| 51 | + icon="el-icon-plus" | ||
| 52 | + size="mini" | ||
| 53 | + @click="handleAdd" | ||
| 54 | + v-hasPermi="['casefile:violationWarningInformation:add']" | ||
| 55 | + >新增</el-button> | ||
| 56 | + </el-col> | ||
| 57 | + <el-col :span="1.5"> | ||
| 58 | + <el-button | ||
| 59 | + type="success" | ||
| 60 | + icon="el-icon-edit" | ||
| 61 | + size="mini" | ||
| 62 | + :disabled="single" | ||
| 63 | + @click="handleUpdate" | ||
| 64 | + v-hasPermi="['casefile:violationWarningInformation:edit']" | ||
| 65 | + >修改</el-button> | ||
| 66 | + </el-col> | ||
| 67 | + <el-col :span="1.5"> | ||
| 68 | + <el-button | ||
| 69 | + type="danger" | ||
| 70 | + icon="el-icon-delete" | ||
| 71 | + size="mini" | ||
| 72 | + :disabled="multiple" | ||
| 73 | + @click="handleDelete" | ||
| 74 | + v-hasPermi="['casefile:violationWarningInformation:remove']" | ||
| 75 | + >删除</el-button> | ||
| 76 | + </el-col> | ||
| 77 | + <el-col :span="1.5"> | ||
| 78 | + <el-button | ||
| 79 | + type="warning" | ||
| 80 | + icon="el-icon-download" | ||
| 81 | + size="mini" | ||
| 82 | + @click="handleExport" | ||
| 83 | + v-hasPermi="['casefile:violationWarningInformation:export']" | ||
| 84 | + >导出</el-button> | ||
| 85 | + </el-col> | ||
| 86 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||
| 87 | + </el-row> | ||
| 88 | + | ||
| 89 | + <el-table v-loading="loading" :data="violationWarningInformationList" @selection-change="handleSelectionChange"> | ||
| 90 | + <el-table-column type="selection" width="55" align="center" /> | ||
| 91 | + <el-table-column label="所属区域" align="center" prop="owningRegion" /> | ||
| 92 | + <el-table-column label="违规对象类型" align="center" prop="violationObjectType" /> | ||
| 93 | + <el-table-column label="违规类型" align="center" prop="violationType" /> | ||
| 94 | + <el-table-column label="项目名称" align="center" prop="projectName" /> | ||
| 95 | + <el-table-column label="企业名称" align="center" prop="companyName" /> | ||
| 96 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||
| 97 | + <template slot-scope="scope"> | ||
| 98 | + <el-button | ||
| 99 | + size="mini" | ||
| 100 | + type="text" | ||
| 101 | + icon="el-icon-edit" | ||
| 102 | + @click="handleInfo(scope.row)" | ||
| 103 | + v-hasPermi="['casefile:violationWarningInformation:edit']" | ||
| 104 | + >详情</el-button> | ||
| 105 | + <el-button | ||
| 106 | + size="mini" | ||
| 107 | + type="text" | ||
| 108 | + icon="el-icon-edit" | ||
| 109 | + @click="handleUpdate(scope.row)" | ||
| 110 | + v-hasPermi="['casefile:violationWarningInformation:edit']" | ||
| 111 | + >修改</el-button> | ||
| 112 | + <el-button | ||
| 113 | + size="mini" | ||
| 114 | + type="text" | ||
| 115 | + icon="el-icon-delete" | ||
| 116 | + @click="handleDelete(scope.row)" | ||
| 117 | + v-hasPermi="['casefile:violationWarningInformation:remove']" | ||
| 118 | + >删除</el-button> | ||
| 119 | + </template> | ||
| 120 | + </el-table-column> | ||
| 121 | + </el-table> | ||
| 122 | + | ||
| 123 | + <pagination | ||
| 124 | + v-show="total>0" | ||
| 125 | + :total="total" | ||
| 126 | + :page.sync="queryParams.pageNum" | ||
| 127 | + :limit.sync="queryParams.pageSize" | ||
| 128 | + @pagination="getList" | ||
| 129 | + /> | ||
| 130 | + | ||
| 131 | + <!-- 添加或修改违规预警信息对话框 --> | ||
| 132 | + <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body> | ||
| 133 | + <el-form ref="form" :model="form" :rules="rules" label-width="115px"> | ||
| 134 | + <el-row :gutter="2"> | ||
| 135 | + <el-col :span="11"> | ||
| 136 | + <el-form-item label="案卷编号" prop="number"> | ||
| 137 | + <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/> | ||
| 138 | + </el-form-item> | ||
| 139 | + </el-col> | ||
| 140 | + <el-col :span="11"> | ||
| 141 | + <el-form-item label="违规对象类型" prop="violationObjectType"> | ||
| 142 | + <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;"> | ||
| 143 | + <el-option label="对象1" value="对象1" /> | ||
| 144 | + <el-option label="对象2" value="对象2" /> | ||
| 145 | + </el-select> | ||
| 146 | + </el-form-item> | ||
| 147 | + </el-col> | ||
| 148 | + </el-row> | ||
| 149 | + <el-row :gutter="2"> | ||
| 150 | + <el-col :span="11"> | ||
| 151 | + <el-form-item label="所属区域" prop="owningRegion"> | ||
| 152 | + <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;"> | ||
| 153 | + <el-option label="区域1" value="区域1" /> | ||
| 154 | + <el-option label="区域2" value="区域2" /> | ||
| 155 | + </el-select> | ||
| 156 | + </el-form-item> | ||
| 157 | + </el-col> | ||
| 158 | + <el-col :span="11"> | ||
| 159 | + <el-form-item label="违规类型" prop="violationType"> | ||
| 160 | + <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;"> | ||
| 161 | + <el-option label="违规1" value="违规1" /> | ||
| 162 | + <el-option label="违规2" value="违规2" /> | ||
| 163 | + </el-select> | ||
| 164 | + </el-form-item> | ||
| 165 | + </el-col> | ||
| 166 | + </el-row> | ||
| 167 | + <el-row :gutter="2"> | ||
| 168 | + <el-col :span="11"> | ||
| 169 | + <el-form-item label="违规等级" prop="violationGrade"> | ||
| 170 | + <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;"> | ||
| 171 | + <el-option label="一般类" value="一般类"/> | ||
| 172 | + <el-option label="重点类" value="重点类" /> | ||
| 173 | + </el-select> | ||
| 174 | + </el-form-item> | ||
| 175 | + </el-col> | ||
| 176 | + <el-col :span="11"> | ||
| 177 | + <el-form-item label="项目名称" prop="projectName"> | ||
| 178 | + <el-select v-model="form.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"> | ||
| 179 | + <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option> | ||
| 180 | + </el-select> | ||
| 181 | + </el-form-item> | ||
| 182 | + </el-col> | ||
| 183 | + </el-row> | ||
| 184 | + <el-row :gutter="2"> | ||
| 185 | + <el-col :span="8" :offset="3"> | ||
| 186 | + <el-button type="primary" @click="createDescribe">生成违规描述</el-button> | ||
| 187 | + </el-col> | ||
| 188 | + <el-col :span="11"> | ||
| 189 | + <el-form-item label="企业名称" prop="companyName"> | ||
| 190 | + <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;"> | ||
| 191 | + <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option> | ||
| 192 | + </el-select> | ||
| 193 | + </el-form-item> | ||
| 194 | + </el-col> | ||
| 195 | + </el-row> | ||
| 196 | + <el-row> | ||
| 197 | + <el-col :span="22"> | ||
| 198 | + <el-form-item label="违规描述" prop="describe"> | ||
| 199 | + <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4"/> | ||
| 200 | + </el-form-item> | ||
| 201 | + </el-col> | ||
| 202 | + </el-row> | ||
| 203 | + <el-form-item label="推送对象"> | ||
| 204 | + <el-radio-group v-model="form.sendObject"> | ||
| 205 | + <el-radio label="区管理部门(治)">区管理部门(治)</el-radio> | ||
| 206 | + <el-radio label="区管理部门(消)">区管理部门(消)</el-radio> | ||
| 207 | + <el-radio label="运输企业">运输企业</el-radio> | ||
| 208 | + </el-radio-group> | ||
| 209 | + </el-form-item> | ||
| 210 | + <el-form-item prop="fileEntityList" label="附件"> | ||
| 211 | + <el-upload | ||
| 212 | + ref="upload" | ||
| 213 | + action="" | ||
| 214 | + accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg" | ||
| 215 | + :on-change="fileChange" | ||
| 216 | + :auto-upload="false" | ||
| 217 | + :show-file-list="false" | ||
| 218 | + multiple | ||
| 219 | + :file-list="fileEntityList"> | ||
| 220 | + <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button> | ||
| 221 | + </el-upload> | ||
| 222 | + </el-form-item> | ||
| 223 | + <el-table :data="fileEntityList"> | ||
| 224 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 225 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 226 | + <template slot-scope="scope"> | ||
| 227 | + <el-button | ||
| 228 | + size="small" type="success" | ||
| 229 | + icon="el-icon-download" | ||
| 230 | + @click="downloadFA(scope.row)" | ||
| 231 | + v-hasPermi="['office:management:edit']" | ||
| 232 | + v-if="form.id!=null" | ||
| 233 | + round>下载 | ||
| 234 | + </el-button> | ||
| 235 | + <el-button | ||
| 236 | + size="small" type="danger" | ||
| 237 | + icon="el-icon-delete" | ||
| 238 | + @click="handleDeleteFile(scope.$index)" | ||
| 239 | + v-hasPermi="['office:management:remove']" | ||
| 240 | + round>删除 | ||
| 241 | + </el-button> | ||
| 242 | + </template> | ||
| 243 | + </el-table-column> | ||
| 244 | + </el-table> | ||
| 245 | + </el-form> | ||
| 246 | + <div slot="footer" class="dialog-footer"> | ||
| 247 | + <el-button type="primary" @click="submitForm">确 定</el-button> | ||
| 248 | + <el-button @click="cancel">取 消</el-button> | ||
| 249 | + </div> | ||
| 250 | + </el-dialog> | ||
| 251 | + | ||
| 252 | + <el-dialog :title="title" :visible.sync="openInfo" width="850px" append-to-body> | ||
| 253 | + <violationWarningInformationInfo :idInfo="idInfo" v-if="openInfo"/> | ||
| 254 | + <div slot="footer" class="dialog-footer"> | ||
| 255 | + <el-button @click="cancel">取 消</el-button> | ||
| 256 | + </div> | ||
| 257 | + </el-dialog> | ||
| 258 | + </div> | ||
| 259 | +</template> | ||
| 260 | + | ||
| 261 | +<script> | ||
| 262 | +import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation"; | ||
| 263 | +import violationWarningInformationInfo from "./violationWarningInformationInfo"; | ||
| 264 | + | ||
| 265 | +export default { | ||
| 266 | + name: "ViolationWarningInformation", | ||
| 267 | + components: { violationWarningInformationInfo }, | ||
| 268 | + data() { | ||
| 269 | + return { | ||
| 270 | + // 遮罩层 | ||
| 271 | + loading: true, | ||
| 272 | + // 选中数组 | ||
| 273 | + ids: [], | ||
| 274 | + // 非单个禁用 | ||
| 275 | + single: true, | ||
| 276 | + // 非多个禁用 | ||
| 277 | + multiple: true, | ||
| 278 | + // 显示搜索条件 | ||
| 279 | + showSearch: true, | ||
| 280 | + // 总条数 | ||
| 281 | + total: 0, | ||
| 282 | + // 违规预警信息表格数据 | ||
| 283 | + violationWarningInformationList: [], | ||
| 284 | + // 弹出层标题 | ||
| 285 | + title: "", | ||
| 286 | + // 是否显示弹出层 | ||
| 287 | + open: false, | ||
| 288 | + // 查询参数 | ||
| 289 | + queryParams: { | ||
| 290 | + pageNum: 1, | ||
| 291 | + pageSize: 10, | ||
| 292 | + number: null, | ||
| 293 | + violationObjectType: null, | ||
| 294 | + owningRegion: null, | ||
| 295 | + violationType: null, | ||
| 296 | + violationGrade: null, | ||
| 297 | + projectName: null, | ||
| 298 | + companyName: null, | ||
| 299 | + describe: null, | ||
| 300 | + sendObject: null, | ||
| 301 | + receive: null, | ||
| 302 | + receiveStatus: null, | ||
| 303 | + readBy: null, | ||
| 304 | + readTime: null, | ||
| 305 | + replyOne: null, | ||
| 306 | + replyTwo: null, | ||
| 307 | + replyThree: null | ||
| 308 | + }, | ||
| 309 | + // 表单参数 | ||
| 310 | + form: {}, | ||
| 311 | + // 表单校验 | ||
| 312 | + rules: { | ||
| 313 | + number :[ | ||
| 314 | + { required: true, message: "必填", trigger: "blur" } | ||
| 315 | + ], | ||
| 316 | + violationObjectType :[ | ||
| 317 | + { required: true, message: "必填", trigger: "blur" } | ||
| 318 | + ], | ||
| 319 | + owningRegion :[ | ||
| 320 | + { required: true, message: "必填", trigger: "blur" } | ||
| 321 | + ], | ||
| 322 | + violationType :[ | ||
| 323 | + { required: true, message: "必填", trigger: "blur" } | ||
| 324 | + ], | ||
| 325 | + }, | ||
| 326 | + projectNameList:[ | ||
| 327 | + {name:"项目1"}, | ||
| 328 | + {name:"项目2"}, | ||
| 329 | + {name:"项目3"}, | ||
| 330 | + ], | ||
| 331 | + isLoading: false, | ||
| 332 | + fileEntityList:[], | ||
| 333 | + companyList:[ | ||
| 334 | + {name:"公司1"}, | ||
| 335 | + {name:"公司2"}, | ||
| 336 | + {name:"公司3"}, | ||
| 337 | + ], | ||
| 338 | + isLoadingCompany: false, | ||
| 339 | + idInfo:null, | ||
| 340 | + openInfo:false, | ||
| 341 | + }; | ||
| 342 | + }, | ||
| 343 | + created() { | ||
| 344 | + this.getList(); | ||
| 345 | + }, | ||
| 346 | + methods: { | ||
| 347 | + /** 查询违规预警信息列表 */ | ||
| 348 | + getList() { | ||
| 349 | + this.loading = true; | ||
| 350 | + listViolationWarningInformation(this.queryParams).then(response => { | ||
| 351 | + this.violationWarningInformationList = response.rows; | ||
| 352 | + this.total = response.total; | ||
| 353 | + this.loading = false; | ||
| 354 | + }); | ||
| 355 | + }, | ||
| 356 | + // 取消按钮 | ||
| 357 | + cancel() { | ||
| 358 | + this.open = false; | ||
| 359 | + this.openInfo = false; | ||
| 360 | + this.reset(); | ||
| 361 | + }, | ||
| 362 | + // 表单重置 | ||
| 363 | + reset() { | ||
| 364 | + this.fileEntityList = []; | ||
| 365 | + this.form = { | ||
| 366 | + id: null, | ||
| 367 | + number: null, | ||
| 368 | + violationObjectType: null, | ||
| 369 | + owningRegion: null, | ||
| 370 | + violationType: null, | ||
| 371 | + violationGrade: null, | ||
| 372 | + projectName: null, | ||
| 373 | + companyName: null, | ||
| 374 | + describe: null, | ||
| 375 | + sendObject: "区管理部门(治)", | ||
| 376 | + createTime: null, | ||
| 377 | + createBy: null, | ||
| 378 | + updateTime: null, | ||
| 379 | + updateBy: null, | ||
| 380 | + receive: null, | ||
| 381 | + receiveStatus: 0, | ||
| 382 | + readBy: null, | ||
| 383 | + readTime: null, | ||
| 384 | + replyOne: null, | ||
| 385 | + replyTwo: null, | ||
| 386 | + replyThree: null | ||
| 387 | + }; | ||
| 388 | + this.resetForm("form"); | ||
| 389 | + }, | ||
| 390 | + /** 搜索按钮操作 */ | ||
| 391 | + handleQuery() { | ||
| 392 | + this.queryParams.pageNum = 1; | ||
| 393 | + this.getList(); | ||
| 394 | + }, | ||
| 395 | + /** 重置按钮操作 */ | ||
| 396 | + resetQuery() { | ||
| 397 | + this.resetForm("queryForm"); | ||
| 398 | + this.handleQuery(); | ||
| 399 | + }, | ||
| 400 | + // 多选框选中数据 | ||
| 401 | + handleSelectionChange(selection) { | ||
| 402 | + this.ids = selection.map(item => item.id) | ||
| 403 | + this.single = selection.length!==1 | ||
| 404 | + this.multiple = !selection.length | ||
| 405 | + }, | ||
| 406 | + handleInfo(row){ | ||
| 407 | + this.idInfo = row.id; | ||
| 408 | + this.openInfo = true; | ||
| 409 | + }, | ||
| 410 | + /** 新增按钮操作 */ | ||
| 411 | + handleAdd() { | ||
| 412 | + this.reset(); | ||
| 413 | + this.open = true; | ||
| 414 | + this.form.number = this.getNumber(); | ||
| 415 | + this.form.violationGrade = "一般类"; | ||
| 416 | + this.form.sendObject = "区管理部门(治)"; | ||
| 417 | + this.title = "添加违规预警信息"; | ||
| 418 | + }, | ||
| 419 | + /** 修改按钮操作 */ | ||
| 420 | + handleUpdate(row) { | ||
| 421 | + this.reset(); | ||
| 422 | + const id = row.id || this.ids | ||
| 423 | + getViolationWarningInformation(id).then(response => { | ||
| 424 | + this.form = response.data.violationWarningInformation; | ||
| 425 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 426 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 427 | + this.open = true; | ||
| 428 | + this.title = "修改违规预警信息"; | ||
| 429 | + }); | ||
| 430 | + | ||
| 431 | + }, | ||
| 432 | + /** 提交按钮 */ | ||
| 433 | + submitForm() { | ||
| 434 | + this.$refs["form"].validate(valid => { | ||
| 435 | + if (valid) { | ||
| 436 | + let formData = new FormData(); | ||
| 437 | + let form = this.form; | ||
| 438 | + //去掉params属性 | ||
| 439 | + delete form.params; | ||
| 440 | + formData.append('fileList', null); | ||
| 441 | + //将新增的文件放入formData | ||
| 442 | + this.fileEntityList.forEach(item => { | ||
| 443 | + if(item.id==null){ | ||
| 444 | + formData.append('fileList', item.raw) | ||
| 445 | + } | ||
| 446 | + }) | ||
| 447 | + if (this.form.id != null) { | ||
| 448 | + formData.append("violationWarningInformation", JSON.stringify(form)); | ||
| 449 | + formData.append("uploadFilesList", null); | ||
| 450 | + this.fileEntityList.forEach(item => { | ||
| 451 | + delete item.params; | ||
| 452 | + if(item != "null" && item != null){ | ||
| 453 | + formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); | ||
| 454 | + } | ||
| 455 | + }) | ||
| 456 | + updateViolationWarningInformation(formData).then(response => { | ||
| 457 | + this.msgSuccess("修改成功"); | ||
| 458 | + this.open = false; | ||
| 459 | + this.getList(); | ||
| 460 | + }); | ||
| 461 | + } else { | ||
| 462 | + for (let key in form) { | ||
| 463 | + formData.append(key, form[key] == null ? "" : form[key]) | ||
| 464 | + } | ||
| 465 | + addViolationWarningInformation(formData).then(response => { | ||
| 466 | + this.msgSuccess("新增成功"); | ||
| 467 | + this.open = false; | ||
| 468 | + this.getList(); | ||
| 469 | + }); | ||
| 470 | + } | ||
| 471 | + } | ||
| 472 | + }); | ||
| 473 | + }, | ||
| 474 | + /** 删除按钮操作 */ | ||
| 475 | + handleDelete(row) { | ||
| 476 | + const ids = row.id || this.ids; | ||
| 477 | + this.$confirm('是否确认删除违规预警信息编号为"' + ids + '"的数据项?', "警告", { | ||
| 478 | + confirmButtonText: "确定", | ||
| 479 | + cancelButtonText: "取消", | ||
| 480 | + type: "warning" | ||
| 481 | + }).then(function() { | ||
| 482 | + return delViolationWarningInformation(ids); | ||
| 483 | + }).then(() => { | ||
| 484 | + this.getList(); | ||
| 485 | + this.msgSuccess("删除成功"); | ||
| 486 | + }) | ||
| 487 | + }, | ||
| 488 | + /** 导出按钮操作 */ | ||
| 489 | + handleExport() { | ||
| 490 | + const queryParams = this.queryParams; | ||
| 491 | + this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", { | ||
| 492 | + confirmButtonText: "确定", | ||
| 493 | + cancelButtonText: "取消", | ||
| 494 | + type: "warning" | ||
| 495 | + }).then(function() { | ||
| 496 | + return exportViolationWarningInformation(queryParams); | ||
| 497 | + }).then(response => { | ||
| 498 | + this.download(response.msg); | ||
| 499 | + }) | ||
| 500 | + }, | ||
| 501 | + /** 生成案卷编号 */ | ||
| 502 | + getNumber(){ | ||
| 503 | + const now = new Date(); | ||
| 504 | + const year = now.getFullYear().toString().slice(-2); // 提取后两位数 | ||
| 505 | + const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1; | ||
| 506 | + const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate(); | ||
| 507 | + const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours(); | ||
| 508 | + const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes(); | ||
| 509 | + const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds(); | ||
| 510 | + const millisecond = now.getMilliseconds(); | ||
| 511 | + const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`; | ||
| 512 | + return code; | ||
| 513 | + }, | ||
| 514 | + projectNameLoadOptions(query) { | ||
| 515 | + // 根据输入的关键字query异步加载选项数据 | ||
| 516 | + this.isLoading = true | ||
| 517 | + setTimeout(() => { | ||
| 518 | + // 模拟异步加载数据 | ||
| 519 | + const data = [ | ||
| 520 | + { name:'项目1' }, | ||
| 521 | + { name:'项目2' }, | ||
| 522 | + { name:'项目3' } | ||
| 523 | + ].filter(item => item.name.includes(query)) | ||
| 524 | + this.projectNameList = data | ||
| 525 | + this.isLoading = false | ||
| 526 | + }, 200) | ||
| 527 | + }, | ||
| 528 | + companyLoadOptions(query) { | ||
| 529 | + // 根据输入的关键字query异步加载选项数据 | ||
| 530 | + this.isLoadingCompany = true | ||
| 531 | + setTimeout(() => { | ||
| 532 | + // 模拟异步加载数据 | ||
| 533 | + const data = [ | ||
| 534 | + { name:'公司1' }, | ||
| 535 | + { name:'公司2' }, | ||
| 536 | + { name:'公司3' } | ||
| 537 | + ].filter(item => item.name.includes(query)) | ||
| 538 | + this.companyList = data | ||
| 539 | + this.isLoadingCompany = false | ||
| 540 | + }, 200) | ||
| 541 | + }, | ||
| 542 | + /** | ||
| 543 | + * 文件改变时,限制文件上传格式和大小 | ||
| 544 | + * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg | ||
| 545 | + * 大小不超过20M | ||
| 546 | + * */ | ||
| 547 | + fileChange(file, fileList) { | ||
| 548 | + let count = 0; | ||
| 549 | + for (let i = 0; i < fileList.length; i++) { | ||
| 550 | + // console.log(fileList.length) | ||
| 551 | + // console.log(this.fileEntityList[i].name+"111"+file.name) | ||
| 552 | + if (fileList[i].name == file.name) { | ||
| 553 | + count++; | ||
| 554 | + if (count == 2) { | ||
| 555 | + this.$message({ | ||
| 556 | + message: '已存在此文件！', | ||
| 557 | + type: 'warning' | ||
| 558 | + }); | ||
| 559 | + for (let j = fileList.length; j > 0; j--) { | ||
| 560 | + //如果存在此文件，去除新选择的重复文件 | ||
| 561 | + if (fileList[j - 1].name == file.name) { | ||
| 562 | + fileList.splice(j - 1, 1); | ||
| 563 | + i--; | ||
| 564 | + return false; | ||
| 565 | + } | ||
| 566 | + } | ||
| 567 | + } | ||
| 568 | + } | ||
| 569 | + } | ||
| 570 | + let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase(); | ||
| 571 | + //格式符合后判断大小 | ||
| 572 | + if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) { | ||
| 573 | + let max5M = file.size / 1024 / 1024 < 20; | ||
| 574 | + if (!max5M) { | ||
| 575 | + this.$message({ | ||
| 576 | + message: '上传文件大小不得超过20M！', | ||
| 577 | + type: 'warning' | ||
| 578 | + }); | ||
| 579 | + } else { | ||
| 580 | + //符合条件后进行添加 | ||
| 581 | + this.fileEntityList = fileList | ||
| 582 | + } | ||
| 583 | + } else { | ||
| 584 | + this.$message({ | ||
| 585 | + message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!', | ||
| 586 | + type: 'warning' | ||
| 587 | + }); | ||
| 588 | + } | ||
| 589 | + }, | ||
| 590 | + // 删除文件 | ||
| 591 | + handleDeleteFile(index) { | ||
| 592 | + this.fileEntityList.splice(index, 1); | ||
| 593 | + }, | ||
| 594 | + /** 文件下载 */ | ||
| 595 | + downloadFA(row) { | ||
| 596 | + let name = row.name; | ||
| 597 | + let url = row.url; | ||
| 598 | + const a = document.createElement('a') | ||
| 599 | + a.setAttribute('download', name) | ||
| 600 | + a.setAttribute('target', '_blank') | ||
| 601 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 602 | + a.click() | ||
| 603 | + }, | ||
| 604 | + /** 生成违规描述 */ | ||
| 605 | + createDescribe(){ | ||
| 606 | + this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }] | ||
| 607 | + this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }] | ||
| 608 | + this.$refs["form"].validate(valid => { | ||
| 609 | + if (valid) { | ||
| 610 | + let formData = this.form; | ||
| 611 | + const now = new Date(); | ||
| 612 | + const year = now.getFullYear(); | ||
| 613 | + const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1; | ||
| 614 | + const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate(); | ||
| 615 | + const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours(); | ||
| 616 | + const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes(); | ||
| 617 | + const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds(); | ||
| 618 | + const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`; | ||
| 619 | + this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType; | ||
| 620 | + this.rules.companyName = null; | ||
| 621 | + this.rules.projectName = null; | ||
| 622 | + } | ||
| 623 | + }); | ||
| 624 | + | ||
| 625 | + } | ||
| 626 | + } | ||
| 627 | +}; | ||
| 628 | +</script> |
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" :rules="rules" label-width="115px"> | ||
| 3 | + <el-row :gutter="2"> | ||
| 4 | + <el-col :span="11"> | ||
| 5 | + <el-form-item label="案卷编号" prop="number"> | ||
| 6 | + <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/> | ||
| 7 | + </el-form-item> | ||
| 8 | + </el-col> | ||
| 9 | + <el-col :span="11"> | ||
| 10 | + <el-form-item label="违规对象类型" prop="violationObjectType"> | ||
| 11 | + <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true"> | ||
| 12 | + <el-option label="对象1" value="对象1" /> | ||
| 13 | + <el-option label="对象2" value="对象2" /> | ||
| 14 | + </el-select> | ||
| 15 | + </el-form-item> | ||
| 16 | + </el-col> | ||
| 17 | + </el-row> | ||
| 18 | + <el-row :gutter="2"> | ||
| 19 | + <el-col :span="11"> | ||
| 20 | + <el-form-item label="所属区域" prop="owningRegion"> | ||
| 21 | + <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true"> | ||
| 22 | + <el-option label="区域1" value="区域1" /> | ||
| 23 | + <el-option label="区域2" value="区域2" /> | ||
| 24 | + </el-select> | ||
| 25 | + </el-form-item> | ||
| 26 | + </el-col> | ||
| 27 | + <el-col :span="11"> | ||
| 28 | + <el-form-item label="违规类型" prop="violationType"> | ||
| 29 | + <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true"> | ||
| 30 | + <el-option label="违规1" value="违规1" /> | ||
| 31 | + <el-option label="违规2" value="违规2" /> | ||
| 32 | + </el-select> | ||
| 33 | + </el-form-item> | ||
| 34 | + </el-col> | ||
| 35 | + </el-row> | ||
| 36 | + <el-row :gutter="2"> | ||
| 37 | + <el-col :span="11"> | ||
| 38 | + <el-form-item label="违规等级" prop="violationGrade"> | ||
| 39 | + <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true"> | ||
| 40 | + <el-option label="一般类" value="一般类"/> | ||
| 41 | + <el-option label="重点类" value="重点类" /> | ||
| 42 | + </el-select> | ||
| 43 | + </el-form-item> | ||
| 44 | + </el-col> | ||
| 45 | + <el-col :span="11"> | ||
| 46 | + <el-form-item label="项目名称" prop="projectName"> | ||
| 47 | + <el-select v-model="form.projectName" :disabled="true" style="width: 100%;"> | ||
| 48 | + | ||
| 49 | + </el-select> | ||
| 50 | + </el-form-item> | ||
| 51 | + </el-col> | ||
| 52 | + </el-row> | ||
| 53 | + <el-row :gutter="2"> | ||
| 54 | + <el-col :span="11"> | ||
| 55 | + <el-form-item label="企业名称" prop="companyName"> | ||
| 56 | + <el-select v-model="form.companyName" :disabled="true" style="width: 100%;"> | ||
| 57 | + </el-select> | ||
| 58 | + </el-form-item> | ||
| 59 | + </el-col> | ||
| 60 | + <el-col :span="11"> | ||
| 61 | + <el-form-item label="发送时间" prop="createTime"> | ||
| 62 | + <el-input :value="form.createTime" :disabled="true"/> | ||
| 63 | + </el-form-item> | ||
| 64 | + </el-col> | ||
| 65 | + </el-row> | ||
| 66 | + <el-row :gutter="2"> | ||
| 67 | + <el-col :span="11"> | ||
| 68 | + <el-form-item label="发送人" prop="createBy"> | ||
| 69 | + <el-input :value="form.createBy" :disabled="true"/> | ||
| 70 | + </el-form-item> | ||
| 71 | + </el-col> | ||
| 72 | + <el-col :span="11"> | ||
| 73 | + <el-form-item label="接收人及状态" prop="receive"> | ||
| 74 | + <el-input :value="form.receive!=null?form.receive:'' + form.receiveStatus!=null?form.receiveStatus:''" :disabled="true"/> | ||
| 75 | + </el-form-item> | ||
| 76 | + </el-col> | ||
| 77 | + </el-row> | ||
| 78 | + <el-row :gutter="2"> | ||
| 79 | + <el-col :span="11"> | ||
| 80 | + <el-form-item label="发送人" prop="createBy"> | ||
| 81 | + <el-input :value="form.readTime" :disabled="true"/> | ||
| 82 | + </el-form-item> | ||
| 83 | + </el-col> | ||
| 84 | + </el-row> | ||
| 85 | + <el-row> | ||
| 86 | + <el-col :span="22"> | ||
| 87 | + <el-form-item label="违规描述" prop="describe"> | ||
| 88 | + <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/> | ||
| 89 | + </el-form-item> | ||
| 90 | + </el-col> | ||
| 91 | + </el-row> | ||
| 92 | + <el-form-item label="推送对象"> | ||
| 93 | + <el-radio-group v-model="form.sendObject" :disabled="true"> | ||
| 94 | + <el-radio label="区管理部门(治)">区管理部门(治)</el-radio> | ||
| 95 | + <el-radio label="区管理部门(消)">区管理部门(消)</el-radio> | ||
| 96 | + <el-radio label="运输企业">运输企业</el-radio> | ||
| 97 | + </el-radio-group> | ||
| 98 | + </el-form-item> | ||
| 99 | + <el-table :data="fileEntityList"> | ||
| 100 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 101 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 102 | + <template slot-scope="scope"> | ||
| 103 | + <el-button | ||
| 104 | + size="small" type="success" | ||
| 105 | + icon="el-icon-download" | ||
| 106 | + @click="downloadFA(scope.row)" | ||
| 107 | + v-hasPermi="['office:management:edit']" | ||
| 108 | + v-if="form.id!=null" | ||
| 109 | + round>下载 | ||
| 110 | + </el-button> | ||
| 111 | + </template> | ||
| 112 | + </el-table-column> | ||
| 113 | + </el-table> | ||
| 114 | + </el-form> | ||
| 115 | +</template> | ||
| 116 | + | ||
| 117 | +<script> | ||
| 118 | +import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation"; | ||
| 119 | +export default { | ||
| 120 | + name: "violationWarningInformationInfo", | ||
| 121 | + props: { | ||
| 122 | + businessKey: { | ||
| 123 | + type: String | ||
| 124 | + }, | ||
| 125 | + idInfo: { | ||
| 126 | + type: String | ||
| 127 | + } | ||
| 128 | + }, | ||
| 129 | + data() { | ||
| 130 | + return { | ||
| 131 | + form: {}, | ||
| 132 | + fileEntityList: [], | ||
| 133 | + } | ||
| 134 | + }, | ||
| 135 | + created() { | ||
| 136 | + this.init(); | ||
| 137 | + }, | ||
| 138 | + methods:{ | ||
| 139 | + init(){ | ||
| 140 | + getViolationWarningInformation(this.idInfo).then(response => { | ||
| 141 | + this.form = response.data.violationWarningInformation; | ||
| 142 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 143 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")); | ||
| 144 | + }); | ||
| 145 | + }, | ||
| 146 | + /** 文件下载 */ | ||
| 147 | + downloadFA(row) { | ||
| 148 | + let name = row.name; | ||
| 149 | + let url = row.url; | ||
| 150 | + const a = document.createElement('a') | ||
| 151 | + a.setAttribute('download', name) | ||
| 152 | + a.setAttribute('target', '_blank') | ||
| 153 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 154 | + a.click() | ||
| 155 | + }, | ||
| 156 | + } | ||
| 157 | +} | ||
| 158 | +</script> | ||
| 159 | + | ||
| 160 | +<style scoped> | ||
| 161 | + | ||
| 162 | +</style> |
trash-ui/src/views/office/conference/conferenceInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" label-width="80px"> | ||
| 3 | + <el-row :gutter="2"> | ||
| 4 | + <el-col :span="11"> | ||
| 5 | + <el-form-item label="会议时间" prop="conferenceTime"> | ||
| 6 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 7 | + v-model="form.conferenceTime" | ||
| 8 | + type="datetime" | ||
| 9 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 10 | + :disabled="true" | ||
| 11 | + placeholder="选择会议时间"> | ||
| 12 | + </el-date-picker> | ||
| 13 | + </el-form-item> | ||
| 14 | + </el-col> | ||
| 15 | + <el-col :span="11"> | ||
| 16 | + <el-form-item label="会议地点" prop="conferenceSite"> | ||
| 17 | + <el-input v-model="form.conferenceSite" placeholder="请输入会议地点" :disabled="true"/> | ||
| 18 | + </el-form-item> | ||
| 19 | + </el-col> | ||
| 20 | + </el-row> | ||
| 21 | + <el-row :gutter="2"> | ||
| 22 | + <el-col :span="22"> | ||
| 23 | + <el-form-item label="参会人员" prop="staff"> | ||
| 24 | + <el-input type="textarea" v-model="form.staff" placeholder="请输入参会人员" :rows="4" :disabled="true"/> | ||
| 25 | + </el-form-item> | ||
| 26 | + </el-col> | ||
| 27 | + </el-row> | ||
| 28 | + <el-row :gutter="2"> | ||
| 29 | + <el-col :span="22"> | ||
| 30 | + <el-form-item label="会议议程" prop="content"> | ||
| 31 | + <el-input type="textarea" v-model="form.content" placeholder="请输入会议议程" :rows="4" :disabled="true"/> | ||
| 32 | + </el-form-item> | ||
| 33 | + </el-col> | ||
| 34 | + </el-row> | ||
| 35 | + <el-row :gutter="2"> | ||
| 36 | + <el-col :span="22"> | ||
| 37 | + <el-form-item label="会议要求" prop="requirement"> | ||
| 38 | + <el-input type="textarea" v-model="form.requirement" placeholder="请输入会议要求" :rows="4" :disabled="true"/> | ||
| 39 | + </el-form-item> | ||
| 40 | + </el-col> | ||
| 41 | + </el-row> | ||
| 42 | + <el-row> | ||
| 43 | + <el-table :data="fileEntityList"> | ||
| 44 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 45 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 46 | + <template slot-scope="scope"> | ||
| 47 | + <el-button | ||
| 48 | + size="small" type="success" | ||
| 49 | + icon="el-icon-download" | ||
| 50 | + @click="downloadFA(scope.row)" | ||
| 51 | + v-hasPermi="['office:management:edit']" | ||
| 52 | + v-if="form.id!=null" | ||
| 53 | + round>下载 | ||
| 54 | + </el-button> | ||
| 55 | + </template> | ||
| 56 | + </el-table-column> | ||
| 57 | + </el-table> | ||
| 58 | + </el-row> | ||
| 59 | + </el-form> | ||
| 60 | +</template> | ||
| 61 | + | ||
| 62 | +<script> | ||
| 63 | +import {getConference} from "@/api/office/conference"; | ||
| 64 | +import Editor from '@/components/ZcEditor'; | ||
| 65 | +export default { | ||
| 66 | + name: "conferenceInfo", | ||
| 67 | + components: {Editor}, | ||
| 68 | + props: { | ||
| 69 | + businessKey: { | ||
| 70 | + type: String | ||
| 71 | + }, | ||
| 72 | + idInfo: { | ||
| 73 | + type: String | ||
| 74 | + } | ||
| 75 | + }, | ||
| 76 | + data() { | ||
| 77 | + return { | ||
| 78 | + form: {}, | ||
| 79 | + fileEntityList:[] | ||
| 80 | + } | ||
| 81 | + }, | ||
| 82 | + created() { | ||
| 83 | + this.init(); | ||
| 84 | + }, | ||
| 85 | + methods:{ | ||
| 86 | + init(){ | ||
| 87 | + getConference(this.idInfo).then(response => { | ||
| 88 | + this.form = response.data.conference; | ||
| 89 | + this.form.notify = response.data.conference.notify.split(","); | ||
| 90 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 91 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 92 | + }); | ||
| 93 | + }, | ||
| 94 | + /** 文件下载 */ | ||
| 95 | + downloadFA(row) { | ||
| 96 | + let name = row.name; | ||
| 97 | + let url = row.url; | ||
| 98 | + const a = document.createElement('a') | ||
| 99 | + a.setAttribute('download', name) | ||
| 100 | + a.setAttribute('target', '_blank') | ||
| 101 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 102 | + a.click() | ||
| 103 | + }, | ||
| 104 | + } | ||
| 105 | +} | ||
| 106 | +</script> | ||
| 107 | + | ||
| 108 | +<style scoped> | ||
| 109 | + | ||
| 110 | +</style> |
trash-ui/src/views/office/conference/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="app-container"> | ||
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> | ||
| 4 | + <el-form-item label="会议时间" prop="conferenceTime"> | ||
| 5 | + <el-date-picker clearable size="small" style="width: 200px" | ||
| 6 | + v-model="queryParams.conferenceTime" | ||
| 7 | + type="date" | ||
| 8 | + value-format="yyyy-MM-dd" | ||
| 9 | + placeholder="选择会议时间"> | ||
| 10 | + </el-date-picker> | ||
| 11 | + </el-form-item> | ||
| 12 | + <el-form-item label="科室名称" prop="deptName"> | ||
| 13 | + <el-select v-model="queryParams.deptName" placeholder="请选择科室名称" clearable size="small"> | ||
| 14 | + <el-option label="科室1" value="科室1"/> | ||
| 15 | + <el-option label="科室2" value="科室2"/> | ||
| 16 | + </el-select> | ||
| 17 | + </el-form-item> | ||
| 18 | + <el-form-item label="会议主题" prop="subject"> | ||
| 19 | + <el-input | ||
| 20 | + v-model="queryParams.subject" | ||
| 21 | + placeholder="请输入会议主题" | ||
| 22 | + clearable | ||
| 23 | + size="small" | ||
| 24 | + @keyup.enter.native="handleQuery" | ||
| 25 | + /> | ||
| 26 | + </el-form-item> | ||
| 27 | + <el-form-item> | ||
| 28 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||
| 29 | + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||
| 30 | + </el-form-item> | ||
| 31 | + </el-form> | ||
| 32 | + | ||
| 33 | + <el-row :gutter="10" class="mb8"> | ||
| 34 | + <el-col :span="1.5"> | ||
| 35 | + <el-button | ||
| 36 | + type="primary" | ||
| 37 | + icon="el-icon-plus" | ||
| 38 | + size="mini" | ||
| 39 | + @click="handleAdd" | ||
| 40 | + v-hasPermi="['office:conference:add']" | ||
| 41 | + >新增 | ||
| 42 | + </el-button> | ||
| 43 | + </el-col> | ||
| 44 | + <el-col :span="1.5"> | ||
| 45 | + <el-button | ||
| 46 | + type="success" | ||
| 47 | + icon="el-icon-edit" | ||
| 48 | + size="mini" | ||
| 49 | + :disabled="single" | ||
| 50 | + @click="handleUpdate" | ||
| 51 | + v-hasPermi="['office:conference:edit']" | ||
| 52 | + >修改 | ||
| 53 | + </el-button> | ||
| 54 | + </el-col> | ||
| 55 | + <el-col :span="1.5"> | ||
| 56 | + <el-button | ||
| 57 | + type="danger" | ||
| 58 | + icon="el-icon-delete" | ||
| 59 | + size="mini" | ||
| 60 | + :disabled="multiple" | ||
| 61 | + @click="handleDelete" | ||
| 62 | + v-hasPermi="['office:conference:remove']" | ||
| 63 | + >删除 | ||
| 64 | + </el-button> | ||
| 65 | + </el-col> | ||
| 66 | + <el-col :span="1.5"> | ||
| 67 | + <el-button | ||
| 68 | + type="warning" | ||
| 69 | + icon="el-icon-download" | ||
| 70 | + size="mini" | ||
| 71 | + @click="handleExport" | ||
| 72 | + v-hasPermi="['office:conference:export']" | ||
| 73 | + >导出 | ||
| 74 | + </el-button> | ||
| 75 | + </el-col> | ||
| 76 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||
| 77 | + </el-row> | ||
| 78 | + | ||
| 79 | + <el-table v-loading="loading" :data="conferenceList" @selection-change="handleSelectionChange"> | ||
| 80 | + <el-table-column type="selection" width="55" align="center"/> | ||
| 81 | + <el-table-column label="会议时间" align="center" prop="conferenceTime"/> | ||
| 82 | + <el-table-column label="会议地点" align="center" prop="conferenceSite"/> | ||
| 83 | + <el-table-column label="参会人员" align="center" prop="staff"/> | ||
| 84 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||
| 85 | + <template slot-scope="scope"> | ||
| 86 | + <el-button | ||
| 87 | + size="mini" | ||
| 88 | + type="text" | ||
| 89 | + icon="el-icon-view" | ||
| 90 | + @click="handleInfo(scope.row)" | ||
| 91 | + v-hasPermi="['office:conference:edit']" | ||
| 92 | + >详情 | ||
| 93 | + </el-button> | ||
| 94 | + <el-button | ||
| 95 | + size="mini" | ||
| 96 | + type="text" | ||
| 97 | + icon="el-icon-edit" | ||
| 98 | + @click="handleUpdate(scope.row)" | ||
| 99 | + v-hasPermi="['office:conference:edit']" | ||
| 100 | + >修改 | ||
| 101 | + </el-button> | ||
| 102 | + <el-button | ||
| 103 | + size="mini" | ||
| 104 | + type="text" | ||
| 105 | + icon="el-icon-delete" | ||
| 106 | + @click="handleDelete(scope.row)" | ||
| 107 | + v-hasPermi="['office:conference:remove']" | ||
| 108 | + >删除 | ||
| 109 | + </el-button> | ||
| 110 | + </template> | ||
| 111 | + </el-table-column> | ||
| 112 | + </el-table> | ||
| 113 | + | ||
| 114 | + <pagination | ||
| 115 | + v-show="total>0" | ||
| 116 | + :total="total" | ||
| 117 | + :page.sync="queryParams.pageNum" | ||
| 118 | + :limit.sync="queryParams.pageSize" | ||
| 119 | + @pagination="getList" | ||
| 120 | + /> | ||
| 121 | + | ||
| 122 | + <!-- 添加或修改会议管理对话框 --> | ||
| 123 | + <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body> | ||
| 124 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||
| 125 | + <el-row :gutter="2"> | ||
| 126 | + <el-col :span="11"> | ||
| 127 | + <el-form-item label="会议时间" prop="conferenceTime"> | ||
| 128 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 129 | + v-model="form.conferenceTime" | ||
| 130 | + type="datetime" | ||
| 131 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 132 | + placeholder="选择会议时间"> | ||
| 133 | + </el-date-picker> | ||
| 134 | + </el-form-item> | ||
| 135 | + </el-col> | ||
| 136 | + <el-col :span="11"> | ||
| 137 | + <el-form-item label="会议地点" prop="conferenceSite"> | ||
| 138 | + <el-input v-model="form.conferenceSite" placeholder="请输入会议地点"/> | ||
| 139 | + </el-form-item> | ||
| 140 | + </el-col> | ||
| 141 | + </el-row> | ||
| 142 | + <el-row :gutter="2"> | ||
| 143 | + <el-col :span="22"> | ||
| 144 | + <el-form-item label="参会人员" prop="staff"> | ||
| 145 | + <el-input type="textarea" v-model="form.staff" placeholder="请输入参会人员" :rows="4"/> | ||
| 146 | + </el-form-item> | ||
| 147 | + </el-col> | ||
| 148 | + </el-row> | ||
| 149 | + <el-row :gutter="2"> | ||
| 150 | + <el-col :span="22"> | ||
| 151 | + <el-form-item label="会议议程" prop="content"> | ||
| 152 | + <el-input type="textarea" v-model="form.content" placeholder="请输入会议议程" :rows="4"/> | ||
| 153 | + </el-form-item> | ||
| 154 | + </el-col> | ||
| 155 | + </el-row> | ||
| 156 | + <el-row :gutter="2"> | ||
| 157 | + <el-col :span="22"> | ||
| 158 | + <el-form-item label="会议要求" prop="requirement"> | ||
| 159 | + <el-input type="textarea" v-model="form.requirement" placeholder="请输入会议要求" :rows="4"/> | ||
| 160 | + </el-form-item> | ||
| 161 | + </el-col> | ||
| 162 | + </el-row> | ||
| 163 | + <el-row :gutter="2"> | ||
| 164 | + <el-col :span="11"> | ||
| 165 | + <el-form-item prop="fileEntityList" label="附件"> | ||
| 166 | + <el-upload | ||
| 167 | + ref="upload" | ||
| 168 | + action="" | ||
| 169 | + accept=".docx,.xlsx,.xls,.ppt,.rar,.zip,.doc,.pdf,.png,.jpeg,.png,.jpg" | ||
| 170 | + :on-change="fileChange" | ||
| 171 | + :auto-upload="false" | ||
| 172 | + :show-file-list="false" | ||
| 173 | + multiple | ||
| 174 | + :file-list="fileEntityList"> | ||
| 175 | + <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button> | ||
| 176 | + </el-upload> | ||
| 177 | + </el-form-item> | ||
| 178 | + </el-col> | ||
| 179 | + </el-row> | ||
| 180 | + <el-row> | ||
| 181 | + <el-table :data="fileEntityList"> | ||
| 182 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 183 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 184 | + <template slot-scope="scope"> | ||
| 185 | + <el-button | ||
| 186 | + size="small" type="success" | ||
| 187 | + icon="el-icon-download" | ||
| 188 | + @click="downloadFA(scope.row)" | ||
| 189 | + v-hasPermi="['office:management:edit']" | ||
| 190 | + v-if="form.id!=null" | ||
| 191 | + round>下载 | ||
| 192 | + </el-button> | ||
| 193 | + <el-button | ||
| 194 | + size="small" type="danger" | ||
| 195 | + icon="el-icon-delete" | ||
| 196 | + @click="handleDeleteFile(scope.$index)" | ||
| 197 | + v-hasPermi="['office:management:remove']" | ||
| 198 | + round>删除 | ||
| 199 | + </el-button> | ||
| 200 | + </template> | ||
| 201 | + </el-table-column> | ||
| 202 | + </el-table> | ||
| 203 | + </el-row> | ||
| 204 | + </el-form> | ||
| 205 | + <div slot="footer" class="dialog-footer"> | ||
| 206 | + <el-button type="primary" @click="submitForm">确 定</el-button> | ||
| 207 | + <el-button @click="cancel">取 消</el-button> | ||
| 208 | + </div> | ||
| 209 | + </el-dialog> | ||
| 210 | + <el-dialog :title="title" :visible.sync="openInfo" width="850px" append-to-body> | ||
| 211 | + <conferenceInfo :idInfo="idInfo" v-if="openInfo"/> | ||
| 212 | + <div slot="footer" class="dialog-footer"> | ||
| 213 | + <el-button @click="cancel">取 消</el-button> | ||
| 214 | + </div> | ||
| 215 | + </el-dialog> | ||
| 216 | + </div> | ||
| 217 | +</template> | ||
| 218 | + | ||
| 219 | +<script> | ||
| 220 | +import { | ||
| 221 | + listConference, | ||
| 222 | + getConference, | ||
| 223 | + delConference, | ||
| 224 | + addConference, | ||
| 225 | + updateConference, | ||
| 226 | + exportConference | ||
| 227 | +} from "@/api/office/conference"; | ||
| 228 | +import Editor from '@/components/ZcEditor'; | ||
| 229 | +import conferenceInfo from "./conferenceInfo"; | ||
| 230 | + | ||
| 231 | +export default { | ||
| 232 | + name: "Conference", | ||
| 233 | + components: {Editor,conferenceInfo}, | ||
| 234 | + data() { | ||
| 235 | + return { | ||
| 236 | + // 遮罩层 | ||
| 237 | + loading: true, | ||
| 238 | + // 选中数组 | ||
| 239 | + ids: [], | ||
| 240 | + // 非单个禁用 | ||
| 241 | + single: true, | ||
| 242 | + // 非多个禁用 | ||
| 243 | + multiple: true, | ||
| 244 | + // 显示搜索条件 | ||
| 245 | + showSearch: true, | ||
| 246 | + // 总条数 | ||
| 247 | + total: 0, | ||
| 248 | + // 会议管理表格数据 | ||
| 249 | + conferenceList: [], | ||
| 250 | + // 弹出层标题 | ||
| 251 | + title: "", | ||
| 252 | + // 是否显示弹出层 | ||
| 253 | + open: false, | ||
| 254 | + // 查询参数 | ||
| 255 | + queryParams: { | ||
| 256 | + pageNum: 1, | ||
| 257 | + pageSize: 10, | ||
| 258 | + conferenceTime: null, | ||
| 259 | + conferenceSite: null, | ||
| 260 | + deptId: null, | ||
| 261 | + deptName: null, | ||
| 262 | + staff: null, | ||
| 263 | + subject: null, | ||
| 264 | + content: null, | ||
| 265 | + notify: null, | ||
| 266 | + }, | ||
| 267 | + // 表单参数 | ||
| 268 | + form: { | ||
| 269 | + notify:["1"] | ||
| 270 | + }, | ||
| 271 | + // 表单校验 | ||
| 272 | + rules: { | ||
| 273 | + conferenceTime: [ | ||
| 274 | + {required: true, message: "必填", trigger: "blur"} | ||
| 275 | + ], | ||
| 276 | + conferenceSite: [ | ||
| 277 | + {required: true, message: "必填", trigger: "blur"} | ||
| 278 | + ], | ||
| 279 | + staff: [ | ||
| 280 | + {required: true, message: "必填", trigger: "blur"} | ||
| 281 | + ], | ||
| 282 | + content: [ | ||
| 283 | + {required: true, message: "必填", trigger: "blur"} | ||
| 284 | + ], | ||
| 285 | + }, | ||
| 286 | + fileEntityList: [], | ||
| 287 | + openInfo:false, | ||
| 288 | + idInfo:null, | ||
| 289 | + }; | ||
| 290 | + }, | ||
| 291 | + created() { | ||
| 292 | + this.getList(); | ||
| 293 | + }, | ||
| 294 | + methods: { | ||
| 295 | + /** 查询会议管理列表 */ | ||
| 296 | + getList() { | ||
| 297 | + this.loading = true; | ||
| 298 | + listConference(this.queryParams).then(response => { | ||
| 299 | + this.conferenceList = response.rows; | ||
| 300 | + this.total = response.total; | ||
| 301 | + this.loading = false; | ||
| 302 | + }); | ||
| 303 | + }, | ||
| 304 | + // 取消按钮 | ||
| 305 | + cancel() { | ||
| 306 | + this.open = false; | ||
| 307 | + this.openInfo = false; | ||
| 308 | + this.idInfo = null; | ||
| 309 | + this.reset(); | ||
| 310 | + }, | ||
| 311 | + // 表单重置 | ||
| 312 | + reset() { | ||
| 313 | + this.fileEntityList = []; | ||
| 314 | + this.form = { | ||
| 315 | + id: null, | ||
| 316 | + conferenceTime: null, | ||
| 317 | + conferenceSite: null, | ||
| 318 | + deptId: null, | ||
| 319 | + deptName: null, | ||
| 320 | + staff: null, | ||
| 321 | + subject: null, | ||
| 322 | + content: null, | ||
| 323 | + notify: ["1"], | ||
| 324 | + createTime: null, | ||
| 325 | + createBy: null, | ||
| 326 | + updateTime: null, | ||
| 327 | + updateBy: null | ||
| 328 | + }; | ||
| 329 | + this.resetForm("form"); | ||
| 330 | + }, | ||
| 331 | + /** 搜索按钮操作 */ | ||
| 332 | + handleQuery() { | ||
| 333 | + this.queryParams.pageNum = 1; | ||
| 334 | + this.getList(); | ||
| 335 | + }, | ||
| 336 | + /** 重置按钮操作 */ | ||
| 337 | + resetQuery() { | ||
| 338 | + this.resetForm("queryForm"); | ||
| 339 | + this.handleQuery(); | ||
| 340 | + }, | ||
| 341 | + // 多选框选中数据 | ||
| 342 | + handleSelectionChange(selection) { | ||
| 343 | + this.ids = selection.map(item => item.id) | ||
| 344 | + this.single = selection.length !== 1 | ||
| 345 | + this.multiple = !selection.length | ||
| 346 | + }, | ||
| 347 | + /** 查看按钮操作 */ | ||
| 348 | + handleInfo(row){ | ||
| 349 | + this.reset(); | ||
| 350 | + this.idInfo = row.id; | ||
| 351 | + this.title = "请假申请详情"; | ||
| 352 | + this.openInfo = true; | ||
| 353 | + }, | ||
| 354 | + /** 新增按钮操作 */ | ||
| 355 | + handleAdd() { | ||
| 356 | + this.reset(); | ||
| 357 | + this.open = true; | ||
| 358 | + this.title = "添加会议管理"; | ||
| 359 | + }, | ||
| 360 | + /** 修改按钮操作 */ | ||
| 361 | + handleUpdate(row) { | ||
| 362 | + this.reset(); | ||
| 363 | + const id = row.id || this.ids | ||
| 364 | + getConference(id).then(response => { | ||
| 365 | + this.form = response.data.conference; | ||
| 366 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 367 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 368 | + this.open = true; | ||
| 369 | + this.title = "修改会议管理"; | ||
| 370 | + }); | ||
| 371 | + }, | ||
| 372 | + /** 提交按钮 */ | ||
| 373 | + submitForm() { | ||
| 374 | + this.$refs["form"].validate(valid => { | ||
| 375 | + if (valid) { | ||
| 376 | + let formData = new FormData(); | ||
| 377 | + let form = this.form; | ||
| 378 | + //去掉params属性 | ||
| 379 | + delete form.params; | ||
| 380 | + formData.append('fileList', null); | ||
| 381 | + //将新增的文件放入formData | ||
| 382 | + this.fileEntityList.forEach(item => { | ||
| 383 | + if(item.id==null){ | ||
| 384 | + formData.append('fileList', item.raw) | ||
| 385 | + } | ||
| 386 | + }) | ||
| 387 | + if (this.form.id != null) { | ||
| 388 | + formData.append("conference", JSON.stringify(form)); | ||
| 389 | + formData.append("uploadFilesList", null); | ||
| 390 | + this.fileEntityList.forEach(item => { | ||
| 391 | + delete item.params; | ||
| 392 | + if(item != "null" && item != null){ | ||
| 393 | + formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); | ||
| 394 | + } | ||
| 395 | + }) | ||
| 396 | + updateConference(formData).then(response => { | ||
| 397 | + this.msgSuccess("修改成功"); | ||
| 398 | + this.open = false; | ||
| 399 | + this.fileEntityList = []; | ||
| 400 | + this.getList(); | ||
| 401 | + }); | ||
| 402 | + } else { | ||
| 403 | + for (let key in form) { | ||
| 404 | + formData.append(key, form[key] == null ? "" : form[key]) | ||
| 405 | + } | ||
| 406 | + addConference(formData).then(response => { | ||
| 407 | + this.msgSuccess("新增成功"); | ||
| 408 | + this.open = false; | ||
| 409 | + this.fileEntityList = []; | ||
| 410 | + this.getList(); | ||
| 411 | + }); | ||
| 412 | + } | ||
| 413 | + } | ||
| 414 | + }); | ||
| 415 | + }, | ||
| 416 | + /** 删除按钮操作 */ | ||
| 417 | + handleDelete(row) { | ||
| 418 | + const ids = row.id || this.ids; | ||
| 419 | + this.$confirm('是否确认删除会议管理编号为"' + ids + '"的数据项?', "警告", { | ||
| 420 | + confirmButtonText: "确定", | ||
| 421 | + cancelButtonText: "取消", | ||
| 422 | + type: "warning" | ||
| 423 | + }).then(function () { | ||
| 424 | + return delConference(ids); | ||
| 425 | + }).then(() => { | ||
| 426 | + this.getList(); | ||
| 427 | + this.msgSuccess("删除成功"); | ||
| 428 | + }) | ||
| 429 | + }, | ||
| 430 | + /** 导出按钮操作 */ | ||
| 431 | + handleExport() { | ||
| 432 | + const queryParams = this.queryParams; | ||
| 433 | + this.$confirm('是否确认导出所有会议管理数据项?', "警告", { | ||
| 434 | + confirmButtonText: "确定", | ||
| 435 | + cancelButtonText: "取消", | ||
| 436 | + type: "warning" | ||
| 437 | + }).then(function () { | ||
| 438 | + return exportConference(queryParams); | ||
| 439 | + }).then(response => { | ||
| 440 | + this.download(response.msg); | ||
| 441 | + }) | ||
| 442 | + }, | ||
| 443 | + /** | ||
| 444 | + * 文件改变时,限制文件上传格式和大小 | ||
| 445 | + * 文件格式只能为docx/xlsx/xls/ppt/rar/zip/doc/pdf/png/jpeg/png/jpg | ||
| 446 | + * 大小不超过5M | ||
| 447 | + * */ | ||
| 448 | + fileChange(file, fileList) { | ||
| 449 | + let count = 0; | ||
| 450 | + for (let i = 0; i < fileList.length; i++) { | ||
| 451 | + // console.log(fileList.length) | ||
| 452 | + // console.log(this.fileEntityList[i].name+"111"+file.name) | ||
| 453 | + if (fileList[i].name == file.name) { | ||
| 454 | + count++; | ||
| 455 | + if (count == 2) { | ||
| 456 | + this.$message({ | ||
| 457 | + message: '已存在此文件！', | ||
| 458 | + type: 'warning' | ||
| 459 | + }); | ||
| 460 | + for (let j = fileList.length; j > 0; j--) { | ||
| 461 | + //如果存在此文件，去除新选择的重复文件 | ||
| 462 | + if (fileList[j - 1].name == file.name) { | ||
| 463 | + fileList.splice(j - 1, 1); | ||
| 464 | + i--; | ||
| 465 | + return false; | ||
| 466 | + } | ||
| 467 | + } | ||
| 468 | + } | ||
| 469 | + } | ||
| 470 | + } | ||
| 471 | + let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase(); | ||
| 472 | + //格式符合后判断大小 | ||
| 473 | + if ("docx,xlsx,xls,ppt,rar,zip,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) { | ||
| 474 | + let max5M = file.size / 1024 / 1024 < 5; | ||
| 475 | + if (!max5M) { | ||
| 476 | + this.$message({ | ||
| 477 | + message: '上传文件大小不得超过5M！', | ||
| 478 | + type: 'warning' | ||
| 479 | + }); | ||
| 480 | + } else { | ||
| 481 | + //符合条件后进行添加 | ||
| 482 | + this.fileEntityList = fileList | ||
| 483 | + } | ||
| 484 | + } else { | ||
| 485 | + this.$message({ | ||
| 486 | + message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!', | ||
| 487 | + type: 'warning' | ||
| 488 | + }); | ||
| 489 | + } | ||
| 490 | + }, | ||
| 491 | + // 删除文件 | ||
| 492 | + handleDeleteFile(index) { | ||
| 493 | + this.fileEntityList.splice(index, 1); | ||
| 494 | + }, | ||
| 495 | + /** 文件下载 */ | ||
| 496 | + downloadFA(row) { | ||
| 497 | + let name = row.name; | ||
| 498 | + let url = row.url; | ||
| 499 | + const a = document.createElement('a') | ||
| 500 | + a.setAttribute('download', name) | ||
| 501 | + a.setAttribute('target', '_blank') | ||
| 502 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 503 | + a.click() | ||
| 504 | + }, | ||
| 505 | + } | ||
| 506 | +}; | ||
| 507 | +</script> |
trash-ui/src/views/office/handle/handleInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" :rules="rules" label-width="110px"> | ||
| 3 | + <el-form-item label="办文办事类型" prop="type"> | ||
| 4 | + <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%"> | ||
| 5 | + <el-option label="传阅学习类" value="0" /> | ||
| 6 | + <el-option label="公文批办类" value="1" /> | ||
| 7 | + <el-option label="热线举报类" value="2" /> | ||
| 8 | + <el-option label="上级信访类" value="3" /> | ||
| 9 | + </el-select> | ||
| 10 | + </el-form-item> | ||
| 11 | + <!-- 公文类 --> | ||
| 12 | + <el-form-item label="来文单位" prop="company" v-if="form.type==0 || form.type==1"> | ||
| 13 | + <el-input v-model="form.company" placeholder="请输入来文单位" /> | ||
| 14 | + </el-form-item> | ||
| 15 | + <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1"> | ||
| 16 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 17 | + v-model="form.receiveTime" | ||
| 18 | + type="date" | ||
| 19 | + value-format="yyyy-MM-dd" | ||
| 20 | + placeholder="选择收文时间"> | ||
| 21 | + </el-date-picker> | ||
| 22 | + </el-form-item> | ||
| 23 | + <el-form-item label="文件标题" prop="title" v-if="form.type==0 || form.type==1"> | ||
| 24 | + <el-input v-model="form.title" placeholder="请输入文件标题" /> | ||
| 25 | + </el-form-item> | ||
| 26 | + <!-- 信访类 --> | ||
| 27 | + <el-form-item label="信访单位(人)" prop="sendPerson" v-if="form.type==2 || form.type==3"> | ||
| 28 | + <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" /> | ||
| 29 | + </el-form-item> | ||
| 30 | + <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3"> | ||
| 31 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 32 | + v-model="form.sendDate" | ||
| 33 | + type="date" | ||
| 34 | + value-format="yyyy-MM-dd" | ||
| 35 | + placeholder="选择信访日期"> | ||
| 36 | + </el-date-picker> | ||
| 37 | + </el-form-item> | ||
| 38 | + <el-form-item label="诉求" prop="appeal" v-if="form.type==2 || form.type==3"> | ||
| 39 | + <el-input v-model="form.appeal" type="textarea" placeholder="请输入内容" :rows="6"/> | ||
| 40 | + </el-form-item> | ||
| 41 | + <!-- 意见处 --> | ||
| 42 | + <!-- <el-form-item label="办理意见" prop="opinion">--> | ||
| 43 | + <!-- <el-input v-model="form.opinion" placeholder="请输入办理意见" />--> | ||
| 44 | + <!-- </el-form-item>--> | ||
| 45 | + <!-- <el-form-item label="相关部门意见" prop="deptOpinion">--> | ||
| 46 | + <!-- <el-input v-model="form.deptOpinion" placeholder="请输入相关部门意见" />--> | ||
| 47 | + <!-- </el-form-item>--> | ||
| 48 | + <el-row> | ||
| 49 | + <el-table :data="fileEntityList"> | ||
| 50 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 51 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 52 | + <template slot-scope="scope"> | ||
| 53 | + <el-button | ||
| 54 | + size="small" type="success" | ||
| 55 | + icon="el-icon-download" | ||
| 56 | + @click="downloadFA(scope.row)" | ||
| 57 | + v-hasPermi="['office:management:edit']" | ||
| 58 | + v-if="form.id!=null" | ||
| 59 | + round>下载 | ||
| 60 | + </el-button> | ||
| 61 | + </template> | ||
| 62 | + </el-table-column> | ||
| 63 | + </el-table> | ||
| 64 | + </el-row> | ||
| 65 | + </el-form> | ||
| 66 | +</template> | ||
| 67 | + | ||
| 68 | +<script> | ||
| 69 | +import {getHandle} from "@/api/office/handle"; | ||
| 70 | +export default { | ||
| 71 | + name: "contractInfo", | ||
| 72 | + props: { | ||
| 73 | + businessKey: { | ||
| 74 | + type: String | ||
| 75 | + }, | ||
| 76 | + idInfo: { | ||
| 77 | + type: Number | ||
| 78 | + } | ||
| 79 | + }, | ||
| 80 | + data() { | ||
| 81 | + return { | ||
| 82 | + form: {}, | ||
| 83 | + fileEntityList:[] | ||
| 84 | + } | ||
| 85 | + }, | ||
| 86 | + created() { | ||
| 87 | + this.init(); | ||
| 88 | + }, | ||
| 89 | + methods:{ | ||
| 90 | + init(){ | ||
| 91 | + getHandle(this.idInfo).then(response => { | ||
| 92 | + this.form = response.data.handleAffairs; | ||
| 93 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 94 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 95 | + }); | ||
| 96 | + }, | ||
| 97 | + /** 文件下载 */ | ||
| 98 | + downloadFA(row) { | ||
| 99 | + let name = row.name; | ||
| 100 | + let url = row.url; | ||
| 101 | + const a = document.createElement('a') | ||
| 102 | + a.setAttribute('download', name) | ||
| 103 | + a.setAttribute('target', '_blank') | ||
| 104 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 105 | + a.click() | ||
| 106 | + }, | ||
| 107 | + } | ||
| 108 | +} | ||
| 109 | +</script> | ||
| 110 | + | ||
| 111 | +<style scoped> | ||
| 112 | + | ||
| 113 | +</style> |
trash-ui/src/views/office/handle/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="app-container"> | ||
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px"> | ||
| 4 | + <el-form-item label="办文办事类型" prop="type"> | ||
| 5 | + <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" clearable size="small"> | ||
| 6 | + <el-option label="传阅学习类" value="0" /> | ||
| 7 | + <el-option label="公文批办类" value="1" /> | ||
| 8 | + <el-option label="热线举报类" value="2" /> | ||
| 9 | + <el-option label="上级信访类" value="3" /> | ||
| 10 | + </el-select> | ||
| 11 | + </el-form-item> | ||
| 12 | + <el-form-item label="来文单位" prop="company"> | ||
| 13 | + <el-input | ||
| 14 | + v-model="queryParams.company" | ||
| 15 | + placeholder="请输入来文单位" | ||
| 16 | + clearable | ||
| 17 | + size="small" | ||
| 18 | + @keyup.enter.native="handleQuery" | ||
| 19 | + /> | ||
| 20 | + </el-form-item> | ||
| 21 | + <el-form-item label="收文时间" prop="receiveTime"> | ||
| 22 | + <el-date-picker clearable size="small" style="width: 200px" | ||
| 23 | + v-model="queryParams.receiveTime" | ||
| 24 | + type="date" | ||
| 25 | + value-format="yyyy-MM-dd" | ||
| 26 | + placeholder="选择收文时间"> | ||
| 27 | + </el-date-picker> | ||
| 28 | + </el-form-item> | ||
| 29 | + <el-form-item label="文件标题" prop="title"> | ||
| 30 | + <el-input | ||
| 31 | + v-model="queryParams.title" | ||
| 32 | + placeholder="请输入文件标题" | ||
| 33 | + clearable | ||
| 34 | + size="small" | ||
| 35 | + @keyup.enter.native="handleQuery" | ||
| 36 | + /> | ||
| 37 | + </el-form-item> | ||
| 38 | + <el-form-item label="信访单位(人)" prop="sendPerson"> | ||
| 39 | + <el-input | ||
| 40 | + v-model="queryParams.sendPerson" | ||
| 41 | + placeholder="请输入信访单位(人)" | ||
| 42 | + clearable | ||
| 43 | + size="small" | ||
| 44 | + @keyup.enter.native="handleQuery" | ||
| 45 | + /> | ||
| 46 | + </el-form-item> | ||
| 47 | + <el-form-item label="信访日期" prop="sendDate"> | ||
| 48 | + <el-date-picker clearable size="small" style="width: 200px" | ||
| 49 | + v-model="queryParams.sendDate" | ||
| 50 | + type="date" | ||
| 51 | + value-format="yyyy-MM-dd" | ||
| 52 | + placeholder="选择收文时间"> | ||
| 53 | + </el-date-picker> | ||
| 54 | + </el-form-item> | ||
| 55 | + <el-form-item> | ||
| 56 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||
| 57 | + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||
| 58 | + </el-form-item> | ||
| 59 | + </el-form> | ||
| 60 | + | ||
| 61 | + <el-row :gutter="10" class="mb8"> | ||
| 62 | + <el-col :span="1.5"> | ||
| 63 | + <el-button | ||
| 64 | + type="primary" | ||
| 65 | + icon="el-icon-plus" | ||
| 66 | + size="mini" | ||
| 67 | + @click="handleAdd" | ||
| 68 | + v-hasPermi="['office:handle:add']" | ||
| 69 | + >新增</el-button> | ||
| 70 | + </el-col> | ||
| 71 | + <el-col :span="1.5"> | ||
| 72 | + <el-button | ||
| 73 | + type="success" | ||
| 74 | + icon="el-icon-edit" | ||
| 75 | + size="mini" | ||
| 76 | + :disabled="single" | ||
| 77 | + @click="handleUpdate" | ||
| 78 | + v-hasPermi="['office:handle:edit']" | ||
| 79 | + >修改</el-button> | ||
| 80 | + </el-col> | ||
| 81 | + <el-col :span="1.5"> | ||
| 82 | + <el-button | ||
| 83 | + type="danger" | ||
| 84 | + icon="el-icon-delete" | ||
| 85 | + size="mini" | ||
| 86 | + :disabled="multiple" | ||
| 87 | + @click="handleDelete" | ||
| 88 | + v-hasPermi="['office:handle:remove']" | ||
| 89 | + >删除</el-button> | ||
| 90 | + </el-col> | ||
| 91 | + <el-col :span="1.5"> | ||
| 92 | + <el-button | ||
| 93 | + type="warning" | ||
| 94 | + icon="el-icon-download" | ||
| 95 | + size="mini" | ||
| 96 | + @click="handleExport" | ||
| 97 | + v-hasPermi="['office:handle:export']" | ||
| 98 | + >导出</el-button> | ||
| 99 | + </el-col> | ||
| 100 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||
| 101 | + </el-row> | ||
| 102 | + | ||
| 103 | + <el-table v-loading="loading" :data="handleList" @selection-change="handleSelectionChange"> | ||
| 104 | + <el-table-column type="selection" width="55" align="center" /> | ||
| 105 | + <el-table-column label="办文办事类型" align="center" prop="type" > | ||
| 106 | + <template slot-scope="scope"> | ||
| 107 | + <span>{{ typeOfName(scope.row.type) }}</span> | ||
| 108 | + </template> | ||
| 109 | + </el-table-column> | ||
| 110 | + <el-table-column label="公文类" align="center"> | ||
| 111 | + <el-table-column label="来文单位" align="center" prop="company" /> | ||
| 112 | + <el-table-column label="收文时间" align="center" prop="receiveTime" width="180"> | ||
| 113 | + <template slot-scope="scope"> | ||
| 114 | + <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span> | ||
| 115 | + </template> | ||
| 116 | + </el-table-column> | ||
| 117 | + <el-table-column label="文件标题" align="center" prop="title" /> | ||
| 118 | + </el-table-column> | ||
| 119 | + <el-table-column label="信访类" align="center"> | ||
| 120 | + <el-table-column label="信访单位(人)" align="center" prop="sendPerson" /> | ||
| 121 | + <el-table-column label="信访日期" align="center" prop="sendDate" /> | ||
| 122 | + <el-table-column label="诉求" align="center" prop="appeal" /> | ||
| 123 | + </el-table-column> | ||
| 124 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||
| 125 | + <template slot-scope="scope"> | ||
| 126 | + <el-button | ||
| 127 | + size="mini" | ||
| 128 | + type="text" | ||
| 129 | + icon="el-icon-edit" | ||
| 130 | + @click="handleInfo(scope.row)" | ||
| 131 | + v-hasPermi="['office:handle:edit']" | ||
| 132 | + >详情</el-button> | ||
| 133 | + <el-button | ||
| 134 | + size="mini" | ||
| 135 | + type="text" | ||
| 136 | + icon="el-icon-edit" | ||
| 137 | + @click="handleUpdate(scope.row)" | ||
| 138 | + v-hasPermi="['office:handle:edit']" | ||
| 139 | + >修改</el-button> | ||
| 140 | + <el-button | ||
| 141 | + size="mini" | ||
| 142 | + type="text" | ||
| 143 | + icon="el-icon-delete" | ||
| 144 | + @click="handleDelete(scope.row)" | ||
| 145 | + v-hasPermi="['office:handle:remove']" | ||
| 146 | + >删除</el-button> | ||
| 147 | + </template> | ||
| 148 | + </el-table-column> | ||
| 149 | + </el-table> | ||
| 150 | + | ||
| 151 | + <pagination | ||
| 152 | + v-show="total>0" | ||
| 153 | + :total="total" | ||
| 154 | + :page.sync="queryParams.pageNum" | ||
| 155 | + :limit.sync="queryParams.pageSize" | ||
| 156 | + @pagination="getList" | ||
| 157 | + /> | ||
| 158 | + | ||
| 159 | + <!-- 添加或修改办文办事对话框 --> | ||
| 160 | + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> | ||
| 161 | + <el-form ref="form" :model="form" :rules="rules" label-width="110px"> | ||
| 162 | + <el-form-item label="办文办事类型" prop="type"> | ||
| 163 | + <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" @change="changeType()"> | ||
| 164 | + <el-option label="传阅学习类" value="0" /> | ||
| 165 | + <el-option label="公文批办类" value="1" /> | ||
| 166 | + <el-option label="热线举报类" value="2" /> | ||
| 167 | + <el-option label="上级信访类" value="3" /> | ||
| 168 | + </el-select> | ||
| 169 | + </el-form-item> | ||
| 170 | + <!-- 公文类 --> | ||
| 171 | + <el-form-item label="来文单位" prop="company" v-if="form.type==0 || form.type==1"> | ||
| 172 | + <el-input v-model="form.company" placeholder="请输入来文单位" /> | ||
| 173 | + </el-form-item> | ||
| 174 | + <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1"> | ||
| 175 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 176 | + v-model="form.receiveTime" | ||
| 177 | + type="date" | ||
| 178 | + value-format="yyyy-MM-dd" | ||
| 179 | + placeholder="选择收文时间"> | ||
| 180 | + </el-date-picker> | ||
| 181 | + </el-form-item> | ||
| 182 | + <el-form-item label="文件标题" prop="title" v-if="form.type==0 || form.type==1"> | ||
| 183 | + <el-input v-model="form.title" placeholder="请输入文件标题" /> | ||
| 184 | + </el-form-item> | ||
| 185 | + <!-- 信访类 --> | ||
| 186 | + <el-form-item label="信访单位(人)" prop="sendPerson" v-if="form.type==2 || form.type==3"> | ||
| 187 | + <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" /> | ||
| 188 | + </el-form-item> | ||
| 189 | + <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3"> | ||
| 190 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 191 | + v-model="form.sendDate" | ||
| 192 | + type="date" | ||
| 193 | + value-format="yyyy-MM-dd" | ||
| 194 | + placeholder="选择信访日期"> | ||
| 195 | + </el-date-picker> | ||
| 196 | + </el-form-item> | ||
| 197 | + <el-form-item label="诉求" prop="appeal" v-if="form.type==2 || form.type==3"> | ||
| 198 | + <el-input v-model="form.appeal" type="textarea" placeholder="请输入内容" :rows="6"/> | ||
| 199 | + </el-form-item> | ||
| 200 | + <!-- 意见处 --> | ||
| 201 | +<!-- <el-form-item label="办理意见" prop="opinion">--> | ||
| 202 | +<!-- <el-input v-model="form.opinion" placeholder="请输入办理意见" />--> | ||
| 203 | +<!-- </el-form-item>--> | ||
| 204 | +<!-- <el-form-item label="相关部门意见" prop="deptOpinion">--> | ||
| 205 | +<!-- <el-input v-model="form.deptOpinion" placeholder="请输入相关部门意见" />--> | ||
| 206 | +<!-- </el-form-item>--> | ||
| 207 | + <el-row> | ||
| 208 | + <el-col> | ||
| 209 | + <el-form-item prop="fileEntityList" label="附件"> | ||
| 210 | + <el-upload | ||
| 211 | + ref="upload" | ||
| 212 | + action="" | ||
| 213 | + accept=".docx,.xlsx,.xls,.ppt,.rar,.zip,.doc,.pdf,.png,.jpeg,.png,.jpg" | ||
| 214 | + :on-change="fileChange" | ||
| 215 | + :auto-upload="false" | ||
| 216 | + :show-file-list="false" | ||
| 217 | + multiple | ||
| 218 | + :file-list="fileEntityList"> | ||
| 219 | + <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button> | ||
| 220 | + </el-upload> | ||
| 221 | + </el-form-item> | ||
| 222 | + </el-col> | ||
| 223 | + </el-row> | ||
| 224 | + <el-row> | ||
| 225 | + <el-table :data="fileEntityList"> | ||
| 226 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 227 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 228 | + <template slot-scope="scope"> | ||
| 229 | + <el-button | ||
| 230 | + size="small" type="success" | ||
| 231 | + icon="el-icon-download" | ||
| 232 | + @click="downloadFA(scope.row)" | ||
| 233 | + v-hasPermi="['office:management:edit']" | ||
| 234 | + v-if="form.id!=null" | ||
| 235 | + round>下载 | ||
| 236 | + </el-button> | ||
| 237 | + <el-button | ||
| 238 | + size="small" type="danger" | ||
| 239 | + icon="el-icon-delete" | ||
| 240 | + @click="handleDeleteFile(scope.$index)" | ||
| 241 | + v-hasPermi="['office:management:remove']" | ||
| 242 | + round>删除 | ||
| 243 | + </el-button> | ||
| 244 | + </template> | ||
| 245 | + </el-table-column> | ||
| 246 | + </el-table> | ||
| 247 | + </el-row> | ||
| 248 | + </el-form> | ||
| 249 | + <div slot="footer" class="dialog-footer"> | ||
| 250 | + <el-button type="primary" @click="submitForm">确 定</el-button> | ||
| 251 | + <el-button @click="cancel">取 消</el-button> | ||
| 252 | + </div> | ||
| 253 | + </el-dialog> | ||
| 254 | + <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body> | ||
| 255 | + <handleInfo :idInfo="idInfo" v-if="openInfo"/> | ||
| 256 | + <div slot="footer" class="dialog-footer"> | ||
| 257 | + <el-button @click="cancel">取 消</el-button> | ||
| 258 | + </div> | ||
| 259 | + </el-dialog> | ||
| 260 | + </div> | ||
| 261 | +</template> | ||
| 262 | + | ||
| 263 | +<script> | ||
| 264 | +import { listHandle, getHandle, delHandle, addHandle, updateHandle, exportHandle } from "@/api/office/handle"; | ||
| 265 | +import handleInfo from "./handleInfo"; | ||
| 266 | +export default { | ||
| 267 | + name: "Handle", | ||
| 268 | + components: { handleInfo }, | ||
| 269 | + data() { | ||
| 270 | + return { | ||
| 271 | + // 遮罩层 | ||
| 272 | + loading: true, | ||
| 273 | + // 选中数组 | ||
| 274 | + ids: [], | ||
| 275 | + // 非单个禁用 | ||
| 276 | + single: true, | ||
| 277 | + // 非多个禁用 | ||
| 278 | + multiple: true, | ||
| 279 | + // 显示搜索条件 | ||
| 280 | + showSearch: true, | ||
| 281 | + // 总条数 | ||
| 282 | + total: 0, | ||
| 283 | + // 办文办事表格数据 | ||
| 284 | + handleList: [], | ||
| 285 | + // 弹出层标题 | ||
| 286 | + title: "", | ||
| 287 | + // 是否显示弹出层 | ||
| 288 | + open: false, | ||
| 289 | + // 查询参数 | ||
| 290 | + queryParams: { | ||
| 291 | + pageNum: 1, | ||
| 292 | + pageSize: 10, | ||
| 293 | + company: null, | ||
| 294 | + receiveTime: null, | ||
| 295 | + title: null, | ||
| 296 | + type: null, | ||
| 297 | + sendPerson: null, | ||
| 298 | + sendDate:null, | ||
| 299 | + }, | ||
| 300 | + // 表单参数 | ||
| 301 | + form: {}, | ||
| 302 | + // 表单校验 | ||
| 303 | + rules: { | ||
| 304 | + company: [ | ||
| 305 | + {required: true, message: "必填", trigger: "blur"} | ||
| 306 | + ], | ||
| 307 | + receiveTime: [ | ||
| 308 | + {required: true, message: "必填", trigger: "blur"} | ||
| 309 | + ], | ||
| 310 | + title: [ | ||
| 311 | + {required: true, message: "必填", trigger: "blur"} | ||
| 312 | + ], | ||
| 313 | + appeal: [ | ||
| 314 | + {required: true, message: "必填", trigger: "blur"} | ||
| 315 | + ], | ||
| 316 | + sendPerson: [ | ||
| 317 | + {required: true, message: "必填", trigger: "blur"} | ||
| 318 | + ], | ||
| 319 | + sendDate: [ | ||
| 320 | + {required: true, message: "必填", trigger: "blur"} | ||
| 321 | + ], | ||
| 322 | + }, | ||
| 323 | + fileEntityList: [], | ||
| 324 | + idInfo: null, | ||
| 325 | + openInfo: false, | ||
| 326 | + }; | ||
| 327 | + }, | ||
| 328 | + created() { | ||
| 329 | + this.getList(); | ||
| 330 | + }, | ||
| 331 | + methods: { | ||
| 332 | + /** 查询办文办事列表 */ | ||
| 333 | + getList() { | ||
| 334 | + this.loading = true; | ||
| 335 | + listHandle(this.queryParams).then(response => { | ||
| 336 | + this.handleList = response.rows; | ||
| 337 | + this.total = response.total; | ||
| 338 | + this.loading = false; | ||
| 339 | + }); | ||
| 340 | + }, | ||
| 341 | + // 取消按钮 | ||
| 342 | + cancel() { | ||
| 343 | + this.open = false; | ||
| 344 | + this.openInfo = false; | ||
| 345 | + this.reset(); | ||
| 346 | + }, | ||
| 347 | + // 表单重置 | ||
| 348 | + reset() { | ||
| 349 | + this.form = { | ||
| 350 | + id: null, | ||
| 351 | + company: null, | ||
| 352 | + receiveTime: null, | ||
| 353 | + title: null, | ||
| 354 | + type: null, | ||
| 355 | + appeal: null, | ||
| 356 | + sendPerson: null, | ||
| 357 | + sendDate: null, | ||
| 358 | + isRead: null, | ||
| 359 | + opinion: null, | ||
| 360 | + deptOpinion: null, | ||
| 361 | + }; | ||
| 362 | + this.fileEntityList = []; | ||
| 363 | + this.resetForm("form"); | ||
| 364 | + }, | ||
| 365 | + /** 搜索按钮操作 */ | ||
| 366 | + handleQuery() { | ||
| 367 | + this.queryParams.pageNum = 1; | ||
| 368 | + this.getList(); | ||
| 369 | + }, | ||
| 370 | + /** 重置按钮操作 */ | ||
| 371 | + resetQuery() { | ||
| 372 | + this.resetForm("queryForm"); | ||
| 373 | + this.handleQuery(); | ||
| 374 | + }, | ||
| 375 | + // 多选框选中数据 | ||
| 376 | + handleSelectionChange(selection) { | ||
| 377 | + this.ids = selection.map(item => item.id) | ||
| 378 | + this.single = selection.length!==1 | ||
| 379 | + this.multiple = !selection.length | ||
| 380 | + }, | ||
| 381 | + /** 新增按钮操作 */ | ||
| 382 | + handleAdd() { | ||
| 383 | + this.reset(); | ||
| 384 | + this.open = true; | ||
| 385 | + this.title = "添加办文办事"; | ||
| 386 | + }, | ||
| 387 | + /** 查看详情 */ | ||
| 388 | + handleInfo(row){ | ||
| 389 | + this.idInfo = row.id; | ||
| 390 | + this.openInfo = true; | ||
| 391 | + this.title = "办文办事详情"; | ||
| 392 | + }, | ||
| 393 | + /** 修改按钮操作 */ | ||
| 394 | + handleUpdate(row) { | ||
| 395 | + this.reset(); | ||
| 396 | + const id = row.id || this.ids | ||
| 397 | + getHandle(id).then(response => { | ||
| 398 | + this.form = response.data.handleAffairs; | ||
| 399 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 400 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 401 | + this.open = true; | ||
| 402 | + this.title = "修改办文办事"; | ||
| 403 | + }); | ||
| 404 | + }, | ||
| 405 | + /** 提交按钮 */ | ||
| 406 | + submitForm() { | ||
| 407 | + this.$refs["form"].validate(valid => { | ||
| 408 | + if (valid) { | ||
| 409 | + let formData = new FormData(); | ||
| 410 | + let form = this.form; | ||
| 411 | + //去掉params属性 | ||
| 412 | + delete form.params; | ||
| 413 | + formData.append('fileList', null); | ||
| 414 | + //将新增的文件放入formData | ||
| 415 | + this.fileEntityList.forEach(item => { | ||
| 416 | + if(item.id==null){ | ||
| 417 | + formData.append('fileList', item.raw) | ||
| 418 | + } | ||
| 419 | + }) | ||
| 420 | + if (this.form.id != null) { | ||
| 421 | + formData.append("handleAffairs", JSON.stringify(form)); | ||
| 422 | + formData.append("uploadFilesList", null); | ||
| 423 | + this.fileEntityList.forEach(item => { | ||
| 424 | + delete item.params; | ||
| 425 | + if(item != "null" && item != null){ | ||
| 426 | + formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); | ||
| 427 | + } | ||
| 428 | + }) | ||
| 429 | + updateHandle(formData).then(response => { | ||
| 430 | + this.msgSuccess("修改成功"); | ||
| 431 | + this.open = false; | ||
| 432 | + this.getList(); | ||
| 433 | + }); | ||
| 434 | + } else { | ||
| 435 | + for (let key in form) { | ||
| 436 | + formData.append(key, form[key] == null ? "" : form[key]) | ||
| 437 | + } | ||
| 438 | + addHandle(formData).then(response => { | ||
| 439 | + this.msgSuccess("新增成功"); | ||
| 440 | + this.open = false; | ||
| 441 | + this.getList(); | ||
| 442 | + }); | ||
| 443 | + } | ||
| 444 | + } | ||
| 445 | + }); | ||
| 446 | + }, | ||
| 447 | + /** 删除按钮操作 */ | ||
| 448 | + handleDelete(row) { | ||
| 449 | + const ids = row.id || this.ids; | ||
| 450 | + this.$confirm('是否确认删除办文办事编号为"' + ids + '"的数据项?', "警告", { | ||
| 451 | + confirmButtonText: "确定", | ||
| 452 | + cancelButtonText: "取消", | ||
| 453 | + type: "warning" | ||
| 454 | + }).then(function() { | ||
| 455 | + return delHandle(ids); | ||
| 456 | + }).then(() => { | ||
| 457 | + this.getList(); | ||
| 458 | + this.msgSuccess("删除成功"); | ||
| 459 | + }) | ||
| 460 | + }, | ||
| 461 | + /** 导出按钮操作 */ | ||
| 462 | + handleExport() { | ||
| 463 | + const queryParams = this.queryParams; | ||
| 464 | + this.$confirm('是否确认导出所有办文办事数据项?', "警告", { | ||
| 465 | + confirmButtonText: "确定", | ||
| 466 | + cancelButtonText: "取消", | ||
| 467 | + type: "warning" | ||
| 468 | + }).then(function() { | ||
| 469 | + return exportHandle(queryParams); | ||
| 470 | + }).then(response => { | ||
| 471 | + this.download(response.msg); | ||
| 472 | + }) | ||
| 473 | + }, | ||
| 474 | + /** | ||
| 475 | + * 文件改变时,限制文件上传格式和大小 | ||
| 476 | + * 文件格式只能为docx/xlsx/xls/ppt/rar/zip/doc/pdf/png/jpeg/png/jpg | ||
| 477 | + * 大小不超过5M | ||
| 478 | + * */ | ||
| 479 | + fileChange(file, fileList) { | ||
| 480 | + let count = 0; | ||
| 481 | + for (let i = 0; i < fileList.length; i++) { | ||
| 482 | + // console.log(fileList.length) | ||
| 483 | + // console.log(this.fileEntityList[i].name+"111"+file.name) | ||
| 484 | + if (fileList[i].name == file.name) { | ||
| 485 | + count++; | ||
| 486 | + if (count == 2) { | ||
| 487 | + this.$message({ | ||
| 488 | + message: '已存在此文件！', | ||
| 489 | + type: 'warning' | ||
| 490 | + }); | ||
| 491 | + for (let j = fileList.length; j > 0; j--) { | ||
| 492 | + //如果存在此文件，去除新选择的重复文件 | ||
| 493 | + if (fileList[j - 1].name == file.name) { | ||
| 494 | + fileList.splice(j - 1, 1); | ||
| 495 | + i--; | ||
| 496 | + return false; | ||
| 497 | + } | ||
| 498 | + } | ||
| 499 | + } | ||
| 500 | + } | ||
| 501 | + } | ||
| 502 | + let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase(); | ||
| 503 | + //格式符合后判断大小 | ||
| 504 | + if ("docx,xlsx,xls,ppt,rar,zip,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) { | ||
| 505 | + let max5M = file.size / 1024 / 1024 < 5; | ||
| 506 | + if (!max5M) { | ||
| 507 | + this.$message({ | ||
| 508 | + message: '上传文件大小不得超过5M！', | ||
| 509 | + type: 'warning' | ||
| 510 | + }); | ||
| 511 | + } else { | ||
| 512 | + //符合条件后进行添加 | ||
| 513 | + this.fileEntityList = fileList | ||
| 514 | + } | ||
| 515 | + } else { | ||
| 516 | + this.$message({ | ||
| 517 | + message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!', | ||
| 518 | + type: 'warning' | ||
| 519 | + }); | ||
| 520 | + } | ||
| 521 | + }, | ||
| 522 | + // 删除文件 | ||
| 523 | + handleDeleteFile(index) { | ||
| 524 | + this.fileEntityList.splice(index, 1); | ||
| 525 | + }, | ||
| 526 | + /** 文件下载 */ | ||
| 527 | + downloadFA(row) { | ||
| 528 | + let name = row.name; | ||
| 529 | + let url = row.url; | ||
| 530 | + const a = document.createElement('a') | ||
| 531 | + a.setAttribute('download', name) | ||
| 532 | + a.setAttribute('target', '_blank') | ||
| 533 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 534 | + a.click() | ||
| 535 | + }, | ||
| 536 | + typeOfName(type){ | ||
| 537 | + if(type==0){ | ||
| 538 | + return "传阅学习"; | ||
| 539 | + }else if(type==1){ | ||
| 540 | + return "公文批办"; | ||
| 541 | + }else if(type==2){ | ||
| 542 | + return "热线举报"; | ||
| 543 | + }else if(type==3){ | ||
| 544 | + return "上级信访" | ||
| 545 | + } | ||
| 546 | + }, | ||
| 547 | + changeType(){ | ||
| 548 | + if(this.form.type==0 || this.form.type==1){ | ||
| 549 | + this.form.sendPerson = null; | ||
| 550 | + this.form.sendDate = null; | ||
| 551 | + this.form.appeal = null; | ||
| 552 | + this.rules.title[0].required = true; | ||
| 553 | + this.rules.company[0].required = true; | ||
| 554 | + this.rules.receiveTime[0].required = true; | ||
| 555 | + this.rules.sendPerson[0].required = false; | ||
| 556 | + this.rules.sendDate[0].required = false; | ||
| 557 | + this.rules.appeal[0].required = false; | ||
| 558 | + }else if(this.form.type==2 || this.form.type==3){ | ||
| 559 | + this.form.title = null; | ||
| 560 | + this.form.company = null; | ||
| 561 | + this.form.receiveTime = null; | ||
| 562 | + this.rules.title[0].required = false; | ||
| 563 | + this.rules.company[0].required = false; | ||
| 564 | + this.rules.receiveTime[0].required = false; | ||
| 565 | + this.rules.sendPerson[0].required = true; | ||
| 566 | + this.rules.sendDate[0].required = true; | ||
| 567 | + this.rules.appeal[0].required = true; | ||
| 568 | + } | ||
| 569 | + } | ||
| 570 | + } | ||
| 571 | +}; | ||
| 572 | +</script> |
trash-ui/src/views/office/leaveApplication/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="app-container"> | ||
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> | ||
| 4 | + <el-form-item label="申请人" prop="applicant"> | ||
| 5 | + <el-input | ||
| 6 | + v-model="queryParams.applicant" | ||
| 7 | + placeholder="请输入申请人" | ||
| 8 | + clearable | ||
| 9 | + size="small" | ||
| 10 | + @keyup.enter.native="handleQuery" | ||
| 11 | + /> | ||
| 12 | + </el-form-item> | ||
| 13 | + <el-form-item label="部门id" prop="deptId"> | ||
| 14 | + <el-select v-model="queryParams.deptId" placeholder="请选择部门id" clearable size="small"> | ||
| 15 | + <el-option label="请选择字典生成" value=""/> | ||
| 16 | + </el-select> | ||
| 17 | + </el-form-item> | ||
| 18 | + <el-form-item label="职务id" prop="positionId"> | ||
| 19 | + <el-select v-model="queryParams.positionId" placeholder="请选择职务id" clearable size="small"> | ||
| 20 | + <el-option label="请选择字典生成" value=""/> | ||
| 21 | + </el-select> | ||
| 22 | + </el-form-item> | ||
| 23 | + <el-form-item label="出生日期" prop="birthdate"> | ||
| 24 | + <el-date-picker clearable size="small" style="width: 200px" | ||
| 25 | + v-model="queryParams.birthdate" | ||
| 26 | + type="date" | ||
| 27 | + value-format="yyyy-MM-dd" | ||
| 28 | + placeholder="选择出生日期"> | ||
| 29 | + </el-date-picker> | ||
| 30 | + </el-form-item> | ||
| 31 | + <el-form-item label="请假类型" prop="type"> | ||
| 32 | + <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small"> | ||
| 33 | + <el-option label="请选择字典生成" value=""/> | ||
| 34 | + </el-select> | ||
| 35 | + </el-form-item> | ||
| 36 | + <el-form-item label="审批状态" prop="status"> | ||
| 37 | + <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small"> | ||
| 38 | + <el-option label="审核中" value="0"/> | ||
| 39 | + <el-option label="审核通过" value="1"/> | ||
| 40 | + <el-option label="被驳回" value="2"/> | ||
| 41 | + </el-select> | ||
| 42 | + </el-form-item> | ||
| 43 | + <el-form-item> | ||
| 44 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||
| 45 | + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||
| 46 | + </el-form-item> | ||
| 47 | + </el-form> | ||
| 48 | + | ||
| 49 | + <el-row :gutter="10" class="mb8"> | ||
| 50 | + <el-col :span="1.5"> | ||
| 51 | + <el-button | ||
| 52 | + type="primary" | ||
| 53 | + icon="el-icon-plus" | ||
| 54 | + size="mini" | ||
| 55 | + @click="handleAdd" | ||
| 56 | + v-hasPermi="['office:leaveApplication:add']" | ||
| 57 | + >新增 | ||
| 58 | + </el-button> | ||
| 59 | + </el-col> | ||
| 60 | + <el-col :span="1.5"> | ||
| 61 | + <el-button | ||
| 62 | + type="success" | ||
| 63 | + icon="el-icon-edit" | ||
| 64 | + size="mini" | ||
| 65 | + :disabled="single" | ||
| 66 | + @click="handleUpdate" | ||
| 67 | + v-hasPermi="['office:leaveApplication:edit']" | ||
| 68 | + >修改 | ||
| 69 | + </el-button> | ||
| 70 | + </el-col> | ||
| 71 | +<!-- <el-col :span="1.5">--> | ||
| 72 | +<!-- <el-button--> | ||
| 73 | +<!-- type="danger"--> | ||
| 74 | +<!-- icon="el-icon-delete"--> | ||
| 75 | +<!-- size="mini"--> | ||
| 76 | +<!-- :disabled="multiple"--> | ||
| 77 | +<!-- @click="handleDelete"--> | ||
| 78 | +<!-- v-hasPermi="['office:leaveApplication:remove']"--> | ||
| 79 | +<!-- >删除--> | ||
| 80 | +<!-- </el-button>--> | ||
| 81 | +<!-- </el-col>--> | ||
| 82 | + <el-col :span="1.5"> | ||
| 83 | + <el-button | ||
| 84 | + type="warning" | ||
| 85 | + icon="el-icon-download" | ||
| 86 | + size="mini" | ||
| 87 | + @click="handleExport" | ||
| 88 | + v-hasPermi="['office:leaveApplication:export']" | ||
| 89 | + >导出 | ||
| 90 | + </el-button> | ||
| 91 | + </el-col> | ||
| 92 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||
| 93 | + </el-row> | ||
| 94 | + | ||
| 95 | + <el-table v-loading="loading" :data="leaveApplicationList" @selection-change="handleSelectionChange"> | ||
| 96 | + <el-table-column type="selection" width="55" align="center"/> | ||
| 97 | + <el-table-column label="申请人" align="center" prop="applicant"/>> | ||
| 98 | + <el-table-column label="联系方式" align="center" prop="phone"/> | ||
| 99 | + <el-table-column label="请假类型" align="center" prop="type"/> | ||
| 100 | + <el-table-column label="请假开始时间" align="center" prop="beginDate" width="180"> | ||
| 101 | + <template slot-scope="scope"> | ||
| 102 | + <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> | ||
| 103 | + </template> | ||
| 104 | + </el-table-column> | ||
| 105 | + <el-table-column label="请假结束时间" align="center" prop="endDate" width="180"> | ||
| 106 | + <template slot-scope="scope"> | ||
| 107 | + <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> | ||
| 108 | + </template> | ||
| 109 | + </el-table-column> | ||
| 110 | + <el-table-column label="请假天数" align="center" prop="numberDays"/> | ||
| 111 | + <el-table-column label="审批状态" align="center" prop="status"> | ||
| 112 | + <template slot-scope="scope"> | ||
| 113 | + <span>{{ parseStatus(scope.row.status) }}</span> | ||
| 114 | + </template> | ||
| 115 | + </el-table-column> | ||
| 116 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||
| 117 | + <template slot-scope="scope"> | ||
| 118 | + <el-button | ||
| 119 | + size="mini" | ||
| 120 | + type="text" | ||
| 121 | + icon="el-icon-view" | ||
| 122 | + @click="handleInfo(scope.row)" | ||
| 123 | + v-hasPermi="['office:leaveApplication:edit']" | ||
| 124 | + >详情 | ||
| 125 | + </el-button> | ||
| 126 | + <el-button | ||
| 127 | + size="mini" | ||
| 128 | + type="text" | ||
| 129 | + icon="el-icon-edit" | ||
| 130 | + @click="handleUpdate(scope.row)" | ||
| 131 | + v-hasPermi="['office:leaveApplication:edit']" | ||
| 132 | + >修改 | ||
| 133 | + </el-button> | ||
| 134 | +<!-- <el-button--> | ||
| 135 | +<!-- size="mini"--> | ||
| 136 | +<!-- type="text"--> | ||
| 137 | +<!-- icon="el-icon-delete"--> | ||
| 138 | +<!-- @click="handleDelete(scope.row)"--> | ||
| 139 | +<!-- v-hasPermi="['office:leaveApplication:remove']"--> | ||
| 140 | +<!-- >删除--> | ||
| 141 | +<!-- </el-button>--> | ||
| 142 | + </template> | ||
| 143 | + </el-table-column> | ||
| 144 | + </el-table> | ||
| 145 | + | ||
| 146 | + <pagination | ||
| 147 | + v-show="total>0" | ||
| 148 | + :total="total" | ||
| 149 | + :page.sync="queryParams.pageNum" | ||
| 150 | + :limit.sync="queryParams.pageSize" | ||
| 151 | + @pagination="getList" | ||
| 152 | + /> | ||
| 153 | + | ||
| 154 | + <!-- 添加或修改请假申请对话框 --> | ||
| 155 | + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> | ||
| 156 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||
| 157 | + | ||
| 158 | + <el-form-item label="联系方式" prop="phone"> | ||
| 159 | + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable/> | ||
| 160 | + </el-form-item> | ||
| 161 | + | ||
| 162 | + <el-form-item label="请假类型" prop="type"> | ||
| 163 | + <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%"> | ||
| 164 | + <el-option label="事假" value="事假"/> | ||
| 165 | + <el-option label="病假" value="病假"/> | ||
| 166 | + <el-option label="年假" value="年假"/> | ||
| 167 | + <el-option label="婚假" value="婚假"/> | ||
| 168 | + <el-option label="产假" value="产假"/> | ||
| 169 | + <el-option label="丧假" value="丧假"/> | ||
| 170 | + <el-option label="探亲假" value="探亲假"/> | ||
| 171 | + <el-option label="护理假" value="护理假"/> | ||
| 172 | + </el-select> | ||
| 173 | + </el-form-item> | ||
| 174 | + | ||
| 175 | + <el-form-item label="请假天数" prop="numberDays"> | ||
| 176 | + <el-input v-model="form.numberDays" placeholder="请输入请假天数"/> | ||
| 177 | + </el-form-item> | ||
| 178 | + | ||
| 179 | + <el-form-item label="开始时间" prop="beginDate"> | ||
| 180 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 181 | + v-model="form.beginDate" | ||
| 182 | + type="datetime" | ||
| 183 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 184 | + placeholder="选择请假开始时间"> | ||
| 185 | + </el-date-picker> | ||
| 186 | + </el-form-item> | ||
| 187 | + <el-form-item label="结束时间" prop="endDate"> | ||
| 188 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 189 | + v-model="form.endDate" | ||
| 190 | + type="datetime" | ||
| 191 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 192 | + placeholder="选择请假结束时间"> | ||
| 193 | + </el-date-picker> | ||
| 194 | + </el-form-item> | ||
| 195 | + <el-form-item label="请假事由"> | ||
| 196 | + <el-input v-model="form.content" type="textarea" :rows="4"/> | ||
| 197 | + </el-form-item> | ||
| 198 | + <el-form-item prop="fileEntityList" label="附件"> | ||
| 199 | + <el-upload | ||
| 200 | + ref="upload" | ||
| 201 | + action="" | ||
| 202 | + accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg" | ||
| 203 | + :on-change="fileChange" | ||
| 204 | + :auto-upload="false" | ||
| 205 | + :show-file-list="false" | ||
| 206 | + multiple | ||
| 207 | + :file-list="fileEntityList"> | ||
| 208 | + <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button> | ||
| 209 | + </el-upload> | ||
| 210 | + </el-form-item> | ||
| 211 | + <el-table :data="fileEntityList"> | ||
| 212 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 213 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 214 | + <template slot-scope="scope"> | ||
| 215 | + <el-button | ||
| 216 | + size="small" type="success" | ||
| 217 | + icon="el-icon-download" | ||
| 218 | + @click="downloadFA(scope.row)" | ||
| 219 | + v-hasPermi="['office:management:edit']" | ||
| 220 | + v-if="form.id!=null" | ||
| 221 | + round>下载 | ||
| 222 | + </el-button> | ||
| 223 | + <el-button | ||
| 224 | + size="small" type="danger" | ||
| 225 | + icon="el-icon-delete" | ||
| 226 | + @click="handleDeleteFile(scope.$index)" | ||
| 227 | + v-hasPermi="['office:management:remove']" | ||
| 228 | + round>删除 | ||
| 229 | + </el-button> | ||
| 230 | + </template> | ||
| 231 | + </el-table-column> | ||
| 232 | + </el-table> | ||
| 233 | + </el-form> | ||
| 234 | + <div slot="footer" class="dialog-footer"> | ||
| 235 | + <el-button type="primary" @click="submitForm">确 定</el-button> | ||
| 236 | + <el-button @click="cancel">取 消</el-button> | ||
| 237 | + </div> | ||
| 238 | + </el-dialog> | ||
| 239 | + | ||
| 240 | + <el-dialog :title="title" :visible.sync="openInfo" width="500px" append-to-body> | ||
| 241 | + <leaveApplicationInfo :idInfo="idInfo" v-if="openInfo"/> | ||
| 242 | + <div slot="footer" class="dialog-footer"> | ||
| 243 | + <el-button @click="cancel">取 消</el-button> | ||
| 244 | + </div> | ||
| 245 | + </el-dialog> | ||
| 246 | + </div> | ||
| 247 | +</template> | ||
| 248 | + | ||
| 249 | +<script> | ||
| 250 | +import { | ||
| 251 | + listLeaveApplication, | ||
| 252 | + getLeaveApplication, | ||
| 253 | + delLeaveApplication, | ||
| 254 | + addLeaveApplication, | ||
| 255 | + updateLeaveApplication, | ||
| 256 | + exportLeaveApplication | ||
| 257 | +} from "@/api/office/leaveApplication"; | ||
| 258 | +import Editor from '@/components/ZcEditor'; | ||
| 259 | +import leaveApplicationInfo from './leaveApplicationInfo'; | ||
| 260 | + | ||
| 261 | +export default { | ||
| 262 | + name: "LeaveApplication", | ||
| 263 | + components: {Editor, leaveApplicationInfo}, | ||
| 264 | + data() { | ||
| 265 | + return { | ||
| 266 | + // 遮罩层 | ||
| 267 | + loading: true, | ||
| 268 | + // 选中数组 | ||
| 269 | + ids: [], | ||
| 270 | + // 非单个禁用 | ||
| 271 | + single: true, | ||
| 272 | + // 非多个禁用 | ||
| 273 | + multiple: true, | ||
| 274 | + // 显示搜索条件 | ||
| 275 | + showSearch: true, | ||
| 276 | + // 总条数 | ||
| 277 | + total: 0, | ||
| 278 | + // 请假申请表格数据 | ||
| 279 | + leaveApplicationList: [], | ||
| 280 | + // 弹出层标题 | ||
| 281 | + title: "", | ||
| 282 | + // 是否显示弹出层 | ||
| 283 | + open: false, | ||
| 284 | + // 查询参数 | ||
| 285 | + queryParams: { | ||
| 286 | + pageNum: 1, | ||
| 287 | + pageSize: 10, | ||
| 288 | + applicant: null, | ||
| 289 | + deptId: null, | ||
| 290 | + positionId: null, | ||
| 291 | + birthdate: null, | ||
| 292 | + phone: null, | ||
| 293 | + type: null, | ||
| 294 | + status: null, | ||
| 295 | + }, | ||
| 296 | + // 表单参数 | ||
| 297 | + form: {}, | ||
| 298 | + // 表单校验 | ||
| 299 | + rules: { | ||
| 300 | + type: [ | ||
| 301 | + {required: true, message: '必填', trigger: 'blur'}, | ||
| 302 | + ], | ||
| 303 | + beginDate: [ | ||
| 304 | + {required: true, message: '必填', trigger: 'blur'}, | ||
| 305 | + ], | ||
| 306 | + endDate: [ | ||
| 307 | + {required: true, message: '必填', trigger: 'blur'}, | ||
| 308 | + ], | ||
| 309 | + phone: [ | ||
| 310 | + {required: true, message: '必填', trigger: 'blur'}, | ||
| 311 | + { | ||
| 312 | + pattern: /^1(3|4|5|7|8|9)\d{9}$/, | ||
| 313 | + message: '手机号格式错误', | ||
| 314 | + trigger: 'blur' | ||
| 315 | + } | ||
| 316 | + ], | ||
| 317 | + numberDays: [ | ||
| 318 | + {required: true, message: '必填', trigger: 'blur'}, | ||
| 319 | + { | ||
| 320 | + pattern: /^(0|[1-9]\d*)(\.5)?$/, | ||
| 321 | + message: '只能为整数或者0.5', | ||
| 322 | + trigger: 'blur' | ||
| 323 | + }, | ||
| 324 | + { | ||
| 325 | + pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/, | ||
| 326 | + message: '不能为0', | ||
| 327 | + trigger: 'blur' | ||
| 328 | + } | ||
| 329 | + ] | ||
| 330 | + }, | ||
| 331 | + openInfo: false, | ||
| 332 | + idInfo: null, | ||
| 333 | + fileEntityList:[], | ||
| 334 | + }; | ||
| 335 | + }, | ||
| 336 | + created() { | ||
| 337 | + this.getList(); | ||
| 338 | + }, | ||
| 339 | + methods: { | ||
| 340 | + /** 查询请假申请列表 */ | ||
| 341 | + getList() { | ||
| 342 | + this.loading = true; | ||
| 343 | + listLeaveApplication(this.queryParams).then(response => { | ||
| 344 | + this.leaveApplicationList = response.rows; | ||
| 345 | + this.total = response.total; | ||
| 346 | + this.loading = false; | ||
| 347 | + }); | ||
| 348 | + }, | ||
| 349 | + // 取消按钮 | ||
| 350 | + cancel() { | ||
| 351 | + this.open = false; | ||
| 352 | + this.openInfo = false; | ||
| 353 | + this.reset(); | ||
| 354 | + }, | ||
| 355 | + // 表单重置 | ||
| 356 | + reset() { | ||
| 357 | + this.fileEntityList = []; | ||
| 358 | + this.form = { | ||
| 359 | + id: null, | ||
| 360 | + applicant: null, | ||
| 361 | + deptId: null, | ||
| 362 | + positionId: null, | ||
| 363 | + workDate: null, | ||
| 364 | + birthdate: null, | ||
| 365 | + phone: null, | ||
| 366 | + type: null, | ||
| 367 | + beginDate: null, | ||
| 368 | + endDate: null, | ||
| 369 | + numberDays: null, | ||
| 370 | + content: null, | ||
| 371 | + status: 0, | ||
| 372 | + createTime: null, | ||
| 373 | + createBy: null, | ||
| 374 | + updateTime: null, | ||
| 375 | + updateBy: null | ||
| 376 | + }; | ||
| 377 | + this.resetForm("form"); | ||
| 378 | + }, | ||
| 379 | + /** 搜索按钮操作 */ | ||
| 380 | + handleQuery() { | ||
| 381 | + this.queryParams.pageNum = 1; | ||
| 382 | + this.getList(); | ||
| 383 | + }, | ||
| 384 | + /** 重置按钮操作 */ | ||
| 385 | + resetQuery() { | ||
| 386 | + this.resetForm("queryForm"); | ||
| 387 | + this.handleQuery(); | ||
| 388 | + }, | ||
| 389 | + // 多选框选中数据 | ||
| 390 | + handleSelectionChange(selection) { | ||
| 391 | + this.ids = selection.map(item => item.id) | ||
| 392 | + this.single = selection.length !== 1 | ||
| 393 | + this.multiple = !selection.length | ||
| 394 | + }, | ||
| 395 | + /** 查看按钮操作 */ | ||
| 396 | + handleInfo(row) { | ||
| 397 | + this.reset(); | ||
| 398 | + this.idInfo = row.id; | ||
| 399 | + this.title = "请假申请详情"; | ||
| 400 | + this.openInfo = true; | ||
| 401 | + }, | ||
| 402 | + /** 新增按钮操作 */ | ||
| 403 | + handleAdd() { | ||
| 404 | + this.reset(); | ||
| 405 | + this.open = true; | ||
| 406 | + this.title = "添加请假申请"; | ||
| 407 | + }, | ||
| 408 | + /** 修改按钮操作 */ | ||
| 409 | + handleUpdate(row) { | ||
| 410 | + this.reset(); | ||
| 411 | + const id = row.id || this.ids | ||
| 412 | + getLeaveApplication(id).then(response => { | ||
| 413 | + this.form = response.data.leaveApplication; | ||
| 414 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 415 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 416 | + this.open = true; | ||
| 417 | + this.title = "修改请假申请"; | ||
| 418 | + }); | ||
| 419 | + }, | ||
| 420 | + /** 提交按钮 */ | ||
| 421 | + submitForm() { | ||
| 422 | + this.$refs["form"].validate(valid => { | ||
| 423 | + if (valid) { | ||
| 424 | + let formData = new FormData(); | ||
| 425 | + let form = this.form; | ||
| 426 | + //去掉params属性 | ||
| 427 | + delete form.params; | ||
| 428 | + formData.append('fileList', null); | ||
| 429 | + //将新增的文件放入formData | ||
| 430 | + this.fileEntityList.forEach(item => { | ||
| 431 | + if(item.id==null){ | ||
| 432 | + formData.append('fileList', item.raw) | ||
| 433 | + } | ||
| 434 | + }) | ||
| 435 | + if (this.form.id != null) { | ||
| 436 | + formData.append("leaveApplication", JSON.stringify(form)); | ||
| 437 | + formData.append("uploadFilesList", null); | ||
| 438 | + this.fileEntityList.forEach(item => { | ||
| 439 | + delete item.params; | ||
| 440 | + if(item != "null" && item != null){ | ||
| 441 | + formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); | ||
| 442 | + } | ||
| 443 | + }) | ||
| 444 | + updateLeaveApplication(formData).then(response => { | ||
| 445 | + this.msgSuccess("修改成功"); | ||
| 446 | + this.open = false; | ||
| 447 | + this.getList(); | ||
| 448 | + }); | ||
| 449 | + } else { | ||
| 450 | + for (let key in form) { | ||
| 451 | + formData.append(key, form[key] == null ? "" : form[key]) | ||
| 452 | + } | ||
| 453 | + addLeaveApplication(formData).then(response => { | ||
| 454 | + this.msgSuccess("新增成功"); | ||
| 455 | + this.open = false; | ||
| 456 | + this.getList(); | ||
| 457 | + }); | ||
| 458 | + } | ||
| 459 | + } | ||
| 460 | + }); | ||
| 461 | + }, | ||
| 462 | + /** 删除按钮操作 */ | ||
| 463 | + handleDelete(row) { | ||
| 464 | + const ids = row.id || this.ids; | ||
| 465 | + this.$confirm('是否确认删除请假申请编号为"' + ids + '"的数据项?', "警告", { | ||
| 466 | + confirmButtonText: "确定", | ||
| 467 | + cancelButtonText: "取消", | ||
| 468 | + type: "warning" | ||
| 469 | + }).then(function () { | ||
| 470 | + return delLeaveApplication(ids); | ||
| 471 | + }).then(() => { | ||
| 472 | + this.getList(); | ||
| 473 | + this.msgSuccess("删除成功"); | ||
| 474 | + }) | ||
| 475 | + }, | ||
| 476 | + /** 导出按钮操作 */ | ||
| 477 | + handleExport() { | ||
| 478 | + const queryParams = this.queryParams; | ||
| 479 | + this.$confirm('是否确认导出所有请假申请数据项?', "警告", { | ||
| 480 | + confirmButtonText: "确定", | ||
| 481 | + cancelButtonText: "取消", | ||
| 482 | + type: "warning" | ||
| 483 | + }).then(function () { | ||
| 484 | + return exportLeaveApplication(queryParams); | ||
| 485 | + }).then(response => { | ||
| 486 | + this.download(response.msg); | ||
| 487 | + }) | ||
| 488 | + }, | ||
| 489 | + /** | ||
| 490 | + * 文件改变时,限制文件上传格式和大小 | ||
| 491 | + * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg | ||
| 492 | + * 大小不超过5M | ||
| 493 | + * */ | ||
| 494 | + fileChange(file, fileList) { | ||
| 495 | + let count = 0; | ||
| 496 | + for (let i = 0; i < fileList.length; i++) { | ||
| 497 | + // console.log(fileList.length) | ||
| 498 | + // console.log(this.fileEntityList[i].name+"111"+file.name) | ||
| 499 | + if (fileList[i].name == file.name) { | ||
| 500 | + count++; | ||
| 501 | + if (count == 2) { | ||
| 502 | + this.$message({ | ||
| 503 | + message: '已存在此文件！', | ||
| 504 | + type: 'warning' | ||
| 505 | + }); | ||
| 506 | + for (let j = fileList.length; j > 0; j--) { | ||
| 507 | + //如果存在此文件，去除新选择的重复文件 | ||
| 508 | + if (fileList[j - 1].name == file.name) { | ||
| 509 | + fileList.splice(j - 1, 1); | ||
| 510 | + i--; | ||
| 511 | + return false; | ||
| 512 | + } | ||
| 513 | + } | ||
| 514 | + } | ||
| 515 | + } | ||
| 516 | + } | ||
| 517 | + let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase(); | ||
| 518 | + //格式符合后判断大小 | ||
| 519 | + if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) { | ||
| 520 | + let max5M = file.size / 1024 / 1024 < 5; | ||
| 521 | + if (!max5M) { | ||
| 522 | + this.$message({ | ||
| 523 | + message: '上传文件大小不得超过5M！', | ||
| 524 | + type: 'warning' | ||
| 525 | + }); | ||
| 526 | + } else { | ||
| 527 | + //符合条件后进行添加 | ||
| 528 | + this.fileEntityList = fileList | ||
| 529 | + } | ||
| 530 | + } else { | ||
| 531 | + this.$message({ | ||
| 532 | + message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!', | ||
| 533 | + type: 'warning' | ||
| 534 | + }); | ||
| 535 | + } | ||
| 536 | + }, | ||
| 537 | + // 删除文件 | ||
| 538 | + handleDeleteFile(index) { | ||
| 539 | + this.fileEntityList.splice(index, 1); | ||
| 540 | + }, | ||
| 541 | + /** 文件下载 */ | ||
| 542 | + downloadFA(row) { | ||
| 543 | + let name = row.name; | ||
| 544 | + let url = row.url; | ||
| 545 | + const a = document.createElement('a') | ||
| 546 | + a.setAttribute('download', name) | ||
| 547 | + a.setAttribute('target', '_blank') | ||
| 548 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 549 | + a.click() | ||
| 550 | + }, | ||
| 551 | + } | ||
| 552 | +}; | ||
| 553 | +</script> |
trash-ui/src/views/office/leaveApplication/leaveApplicationInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" label-width="80px"> | ||
| 3 | + | ||
| 4 | + <el-form-item label="联系方式" prop="phone"> | ||
| 5 | + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable :disabled="true"/> | ||
| 6 | + </el-form-item> | ||
| 7 | + | ||
| 8 | + <el-form-item label="请假类型" prop="type"> | ||
| 9 | + <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true"> | ||
| 10 | + <el-option label="事假" value="事假"/> | ||
| 11 | + <el-option label="病假" value="病假"/> | ||
| 12 | + <el-option label="年假" value="年假"/> | ||
| 13 | + <el-option label="婚假" value="婚假"/> | ||
| 14 | + <el-option label="产假" value="产假"/> | ||
| 15 | + <el-option label="丧假" value="丧假"/> | ||
| 16 | + <el-option label="探亲假" value="探亲假"/> | ||
| 17 | + <el-option label="护理假" value="护理假"/> | ||
| 18 | + </el-select> | ||
| 19 | + </el-form-item> | ||
| 20 | + | ||
| 21 | + <el-form-item label="请假天数" prop="numberDays"> | ||
| 22 | + <el-input v-model="form.numberDays" placeholder="请输入请假天数" :disabled="true"/> | ||
| 23 | + </el-form-item> | ||
| 24 | + | ||
| 25 | + <el-form-item label="开始时间" prop="beginDate"> | ||
| 26 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 27 | + v-model="form.beginDate" | ||
| 28 | + type="datetime" | ||
| 29 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 30 | + :disabled="true" | ||
| 31 | + placeholder="选择请假开始时间"> | ||
| 32 | + </el-date-picker> | ||
| 33 | + </el-form-item> | ||
| 34 | + <el-form-item label="结束时间" prop="endDate"> | ||
| 35 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 36 | + v-model="form.endDate" | ||
| 37 | + type="datetime" | ||
| 38 | + value-format="yyyy-MM-dd HH:mm:ss" | ||
| 39 | + :disabled="true" | ||
| 40 | + placeholder="选择请假结束时间"> | ||
| 41 | + </el-date-picker> | ||
| 42 | + </el-form-item> | ||
| 43 | + <el-form-item label="请假事由"> | ||
| 44 | + <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/> | ||
| 45 | + </el-form-item> | ||
| 46 | + <el-table :data="fileEntityList"> | ||
| 47 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 48 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 49 | + <template slot-scope="scope"> | ||
| 50 | + <el-button | ||
| 51 | + size="small" type="success" | ||
| 52 | + icon="el-icon-download" | ||
| 53 | + @click="downloadFA(scope.row)" | ||
| 54 | + v-hasPermi="['office:management:edit']" | ||
| 55 | + v-if="form.id!=null" | ||
| 56 | + round>下载 | ||
| 57 | + </el-button> | ||
| 58 | + </template> | ||
| 59 | + </el-table-column> | ||
| 60 | + </el-table> | ||
| 61 | + </el-form> | ||
| 62 | +</template> | ||
| 63 | + | ||
| 64 | +<script> | ||
| 65 | +import {getLeaveApplication} from "@/api/office/leaveApplication"; | ||
| 66 | +import Editor from '@/components/ZcEditor'; | ||
| 67 | +export default { | ||
| 68 | + name: "leaveApplicationInfo", | ||
| 69 | + components: { Editor }, | ||
| 70 | + props: { | ||
| 71 | + businessKey: { | ||
| 72 | + type: String | ||
| 73 | + }, | ||
| 74 | + idInfo: { | ||
| 75 | + type: String | ||
| 76 | + } | ||
| 77 | + }, | ||
| 78 | + data() { | ||
| 79 | + return { | ||
| 80 | + form: {}, | ||
| 81 | + fileEntityList: [], | ||
| 82 | + } | ||
| 83 | + }, | ||
| 84 | + created() { | ||
| 85 | + this.init(); | ||
| 86 | + }, | ||
| 87 | + methods:{ | ||
| 88 | + init(){ | ||
| 89 | + getLeaveApplication(this.idInfo).then(response => { | ||
| 90 | + this.form = response.data.leaveApplication; | ||
| 91 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 92 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")); | ||
| 93 | + }); | ||
| 94 | + }, | ||
| 95 | + /** 文件下载 */ | ||
| 96 | + downloadFA(row) { | ||
| 97 | + let name = row.name; | ||
| 98 | + let url = row.url; | ||
| 99 | + const a = document.createElement('a') | ||
| 100 | + a.setAttribute('download', name) | ||
| 101 | + a.setAttribute('target', '_blank') | ||
| 102 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 103 | + a.click() | ||
| 104 | + }, | ||
| 105 | + } | ||
| 106 | +} | ||
| 107 | +</script> | ||
| 108 | + | ||
| 109 | +<style scoped> | ||
| 110 | + | ||
| 111 | +</style> |
trash-ui/src/views/office/logistics/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <div class="app-container"> | ||
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px"> | ||
| 4 | + <el-form-item label="申请类型" prop="type"> | ||
| 5 | + <el-select v-model="queryParams.type" placeholder="请选择申请类型" clearable size="small"> | ||
| 6 | + <el-option label="用章申请" value="用章申请" /> | ||
| 7 | + <el-option label="物品申请" value="物品申请" /> | ||
| 8 | + <el-option label="物品采购申请" value="物品采购申请" /> | ||
| 9 | + </el-select> | ||
| 10 | + </el-form-item> | ||
| 11 | + <el-form-item label="申请部门" prop="deptId"> | ||
| 12 | + <el-select v-model="queryParams.deptId" placeholder="请输入申请部门" clearable size="small"> | ||
| 13 | + <el-option label="部门1" value="1" /> | ||
| 14 | + <el-option label="部门2" value="2" /> | ||
| 15 | + </el-select> | ||
| 16 | + </el-form-item> | ||
| 17 | + <el-form-item label="用章类型" prop="sealType"> | ||
| 18 | + <el-select v-model="queryParams.sealType" placeholder="请选择用章类型" clearable size="small"> | ||
| 19 | + <el-option label="用章类型1" value="用章类型1" /> | ||
| 20 | + <el-option label="用章类型2" value="用章类型2" /> | ||
| 21 | + </el-select> | ||
| 22 | + </el-form-item> | ||
| 23 | + <el-form-item label="物品申请人" prop="staff"> | ||
| 24 | + <el-input | ||
| 25 | + v-model="queryParams.staff" | ||
| 26 | + placeholder="请输入申请人" | ||
| 27 | + clearable | ||
| 28 | + size="small" | ||
| 29 | + @keyup.enter.native="handleQuery" | ||
| 30 | + /> | ||
| 31 | + </el-form-item> | ||
| 32 | + <el-form-item label="物品申请日期" prop="useDate"> | ||
| 33 | + <el-date-picker clearable size="small" style="width: 200px" | ||
| 34 | + v-model="queryParams.useDate" | ||
| 35 | + type="date" | ||
| 36 | + value-format="yyyy-MM-dd" | ||
| 37 | + placeholder="选择申请日期"> | ||
| 38 | + </el-date-picker> | ||
| 39 | + </el-form-item> | ||
| 40 | + <el-form-item label="物品名称" prop="goodsName"> | ||
| 41 | + <el-input | ||
| 42 | + v-model="queryParams.goodsName" | ||
| 43 | + placeholder="请输入物品名称" | ||
| 44 | + clearable | ||
| 45 | + size="small" | ||
| 46 | + @keyup.enter.native="handleQuery" | ||
| 47 | + /> | ||
| 48 | + </el-form-item> | ||
| 49 | + <el-form-item> | ||
| 50 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||
| 51 | + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||
| 52 | + </el-form-item> | ||
| 53 | + </el-form> | ||
| 54 | + | ||
| 55 | + <el-row :gutter="10" class="mb8"> | ||
| 56 | + <el-col :span="1.5"> | ||
| 57 | + <el-button | ||
| 58 | + type="primary" | ||
| 59 | + icon="el-icon-plus" | ||
| 60 | + size="mini" | ||
| 61 | + @click="handleAdd" | ||
| 62 | + v-hasPermi="['office:logistics:add']" | ||
| 63 | + >新增</el-button> | ||
| 64 | + </el-col> | ||
| 65 | + <el-col :span="1.5"> | ||
| 66 | + <el-button | ||
| 67 | + type="success" | ||
| 68 | + icon="el-icon-edit" | ||
| 69 | + size="mini" | ||
| 70 | + :disabled="single" | ||
| 71 | + @click="handleUpdate" | ||
| 72 | + v-hasPermi="['office:logistics:edit']" | ||
| 73 | + >修改</el-button> | ||
| 74 | + </el-col> | ||
| 75 | + <el-col :span="1.5"> | ||
| 76 | + <el-button | ||
| 77 | + type="danger" | ||
| 78 | + icon="el-icon-delete" | ||
| 79 | + size="mini" | ||
| 80 | + :disabled="multiple" | ||
| 81 | + @click="handleDelete" | ||
| 82 | + v-hasPermi="['office:logistics:remove']" | ||
| 83 | + >删除</el-button> | ||
| 84 | + </el-col> | ||
| 85 | + <el-col :span="1.5"> | ||
| 86 | + <el-button | ||
| 87 | + type="warning" | ||
| 88 | + icon="el-icon-download" | ||
| 89 | + size="mini" | ||
| 90 | + @click="handleExport" | ||
| 91 | + v-hasPermi="['office:logistics:export']" | ||
| 92 | + >导出</el-button> | ||
| 93 | + </el-col> | ||
| 94 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||
| 95 | + </el-row> | ||
| 96 | + | ||
| 97 | + <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange"> | ||
| 98 | + <el-table-column type="selection" width="55" align="center" /> | ||
| 99 | + <el-table-column label="申请类型" align="center" prop="type" /> | ||
| 100 | + <el-table-column label="申请部门" align="center" prop="deptId" /> | ||
| 101 | + <!-- 用章申请 --> | ||
| 102 | + <el-table-column label="用章申请" align="center"> | ||
| 103 | + <el-table-column label="用章类型" align="center" prop="sealType" /> | ||
| 104 | + <el-table-column label="更新时间" align="center" prop="sealUpdateTime" width="180"> | ||
| 105 | + <template slot-scope="scope"> | ||
| 106 | + <span>{{ parseTime(scope.row.sealUpdateTime, '{y}-{m}-{d}') }}</span> | ||
| 107 | + </template> | ||
| 108 | + </el-table-column> | ||
| 109 | + <el-table-column label="结束时间" align="center" prop="sealEndTime" width="180"> | ||
| 110 | + <template slot-scope="scope"> | ||
| 111 | + <span>{{ parseTime(scope.row.sealEndTime, '{y}-{m}-{d}') }}</span> | ||
| 112 | + </template> | ||
| 113 | + </el-table-column> | ||
| 114 | + <el-table-column label="用途" align="center" prop="purpose" /> | ||
| 115 | + </el-table-column> | ||
| 116 | + <!-- 物品申请或物品采购申请 --> | ||
| 117 | + <el-table-column label="物品申请或物品采购申请" align="center"> | ||
| 118 | + <el-table-column label="申请人" align="center" prop="staff" /> | ||
| 119 | + <el-table-column label="申请日期" align="center" prop="useDate" width="180"> | ||
| 120 | + <template slot-scope="scope"> | ||
| 121 | + <span>{{ parseTime(scope.row.useDate, '{y}-{m}-{d}') }}</span> | ||
| 122 | + </template> | ||
| 123 | + </el-table-column> | ||
| 124 | + <el-table-column label="物品名称" align="center" prop="goodsName" /> | ||
| 125 | + <el-table-column label="数量" align="center" prop="quantity" /> | ||
| 126 | + </el-table-column> | ||
| 127 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||
| 128 | + <template slot-scope="scope"> | ||
| 129 | + <el-button | ||
| 130 | + size="mini" | ||
| 131 | + type="text" | ||
| 132 | + icon="el-icon-edit" | ||
| 133 | + @click="handleInfo(scope.row)" | ||
| 134 | + v-hasPermi="['office:logistics:edit']" | ||
| 135 | + >详情</el-button> | ||
| 136 | + <el-button | ||
| 137 | + size="mini" | ||
| 138 | + type="text" | ||
| 139 | + icon="el-icon-edit" | ||
| 140 | + @click="handleUpdate(scope.row)" | ||
| 141 | + v-hasPermi="['office:logistics:edit']" | ||
| 142 | + >修改</el-button> | ||
| 143 | + <el-button | ||
| 144 | + size="mini" | ||
| 145 | + type="text" | ||
| 146 | + icon="el-icon-delete" | ||
| 147 | + @click="handleDelete(scope.row)" | ||
| 148 | + v-hasPermi="['office:logistics:remove']" | ||
| 149 | + >删除</el-button> | ||
| 150 | + </template> | ||
| 151 | + </el-table-column> | ||
| 152 | + </el-table> | ||
| 153 | + | ||
| 154 | + <pagination | ||
| 155 | + v-show="total>0" | ||
| 156 | + :total="total" | ||
| 157 | + :page.sync="queryParams.pageNum" | ||
| 158 | + :limit.sync="queryParams.pageSize" | ||
| 159 | + @pagination="getList" | ||
| 160 | + /> | ||
| 161 | + | ||
| 162 | + <!-- 添加或修改后勤管理对话框 --> | ||
| 163 | + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> | ||
| 164 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||
| 165 | + <el-form-item label="申请类型" prop="type"> | ||
| 166 | + <el-select v-model="form.type" placeholder="请选择申请类型" style="width: 100%" @change="changeType()"> | ||
| 167 | + <el-option label="用章申请" value="用章申请" /> | ||
| 168 | + <el-option label="物品申请" value="物品申请" /> | ||
| 169 | + <el-option label="物品采购申请" value="物品采购申请" /> | ||
| 170 | + </el-select> | ||
| 171 | + </el-form-item> | ||
| 172 | + <el-form-item label="申请部门" prop="deptId"> | ||
| 173 | + <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%"> | ||
| 174 | + <el-option label="部门1" value="1" /> | ||
| 175 | + <el-option label="部门2" value="2" /> | ||
| 176 | + </el-select> | ||
| 177 | + </el-form-item> | ||
| 178 | + <el-form-item label="用章类型" prop="sealType" v-if="form.type=='用章申请'"> | ||
| 179 | + <el-select v-model="form.sealType" placeholder="请选择用章类型" style="width: 100%"> | ||
| 180 | + <el-option label="用章类型1" value="用章类型1" /> | ||
| 181 | + <el-option label="用章类型2" value="用章类型2" /> | ||
| 182 | + </el-select> | ||
| 183 | + </el-form-item> | ||
| 184 | + <el-form-item label="更新时间" prop="sealUpdateTime" v-if="form.type=='用章申请'"> | ||
| 185 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 186 | + v-model="form.sealUpdateTime" | ||
| 187 | + type="date" | ||
| 188 | + value-format="yyyy-MM-dd" | ||
| 189 | + placeholder="选择更新时间"> | ||
| 190 | + </el-date-picker> | ||
| 191 | + </el-form-item> | ||
| 192 | + <el-form-item label="结束时间" prop="sealEndTime" v-if="form.type=='用章申请'"> | ||
| 193 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 194 | + v-model="form.sealEndTime" | ||
| 195 | + type="date" | ||
| 196 | + value-format="yyyy-MM-dd" | ||
| 197 | + placeholder="选择结束时间"> | ||
| 198 | + </el-date-picker> | ||
| 199 | + </el-form-item> | ||
| 200 | + <el-form-item label="用途" prop="purpose" v-if="form.type=='用章申请'"> | ||
| 201 | + <el-input v-model="form.purpose" type="textarea" placeholder="请输入内容" :row="4"/> | ||
| 202 | + </el-form-item> | ||
| 203 | + <el-form-item label="申请人" prop="staff" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 204 | + <el-input v-model="form.staff" placeholder="请输入申请人" /> | ||
| 205 | + </el-form-item> | ||
| 206 | + <el-form-item label="申请日期" prop="useDate" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 207 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 208 | + v-model="form.useDate" | ||
| 209 | + type="date" | ||
| 210 | + value-format="yyyy-MM-dd" | ||
| 211 | + placeholder="选择申请日期"> | ||
| 212 | + </el-date-picker> | ||
| 213 | + </el-form-item> | ||
| 214 | + <el-form-item label="物品名称" prop="goodsName" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 215 | + <el-input v-model="form.goodsName" placeholder="请输入物品名称" /> | ||
| 216 | + </el-form-item> | ||
| 217 | + <el-form-item label="数量" prop="quantity" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 218 | + <el-input v-model="form.quantity" placeholder="请输入数量" | ||
| 219 | + @input="form.quantity=form.quantity.replace(/[^0-9]/g,'');" | ||
| 220 | + /> | ||
| 221 | + </el-form-item> | ||
| 222 | + </el-form> | ||
| 223 | + <div slot="footer" class="dialog-footer"> | ||
| 224 | + <el-button type="primary" @click="submitForm">确 定</el-button> | ||
| 225 | + <el-button @click="cancel">取 消</el-button> | ||
| 226 | + </div> | ||
| 227 | + </el-dialog> | ||
| 228 | + <el-dialog :title="title" :visible.sync="openInfo" width="500px" append-to-body> | ||
| 229 | + <logisticsInfo :idInfo="idInfo" @refresh="getList" v-if="openInfo"/> | ||
| 230 | + <div slot="footer" class="dialog-footer"> | ||
| 231 | + <el-button @click="cancel">取 消</el-button> | ||
| 232 | + </div> | ||
| 233 | + </el-dialog> | ||
| 234 | + </div> | ||
| 235 | +</template> | ||
| 236 | + | ||
| 237 | +<script> | ||
| 238 | +import { listLogistics, getLogistics, delLogistics, addLogistics, updateLogistics, exportLogistics } from "@/api/office/logistics"; | ||
| 239 | +import logisticsInfo from "./logisticsInfo"; | ||
| 240 | +export default { | ||
| 241 | + name: "Logistics", | ||
| 242 | + components: { | ||
| 243 | + logisticsInfo | ||
| 244 | + }, | ||
| 245 | + data() { | ||
| 246 | + return { | ||
| 247 | + // 遮罩层 | ||
| 248 | + loading: true, | ||
| 249 | + // 选中数组 | ||
| 250 | + ids: [], | ||
| 251 | + // 非单个禁用 | ||
| 252 | + single: true, | ||
| 253 | + // 非多个禁用 | ||
| 254 | + multiple: true, | ||
| 255 | + // 显示搜索条件 | ||
| 256 | + showSearch: true, | ||
| 257 | + // 总条数 | ||
| 258 | + total: 0, | ||
| 259 | + // 后勤管理表格数据 | ||
| 260 | + logisticsList: [], | ||
| 261 | + // 弹出层标题 | ||
| 262 | + title: "", | ||
| 263 | + // 是否显示弹出层 | ||
| 264 | + open: false, | ||
| 265 | + // 查询参数 | ||
| 266 | + queryParams: { | ||
| 267 | + pageNum: 1, | ||
| 268 | + pageSize: 10, | ||
| 269 | + type: null, | ||
| 270 | + deptId: null, | ||
| 271 | + sealType: null, | ||
| 272 | + staff: null, | ||
| 273 | + useDate: null, | ||
| 274 | + goodsName: null, | ||
| 275 | + }, | ||
| 276 | + // 表单参数 | ||
| 277 | + form: {}, | ||
| 278 | + // 表单校验 | ||
| 279 | + rules: { | ||
| 280 | + type: [ | ||
| 281 | + { required: true, message: "必填", trigger: "blur" } | ||
| 282 | + ], | ||
| 283 | + deptId: [ | ||
| 284 | + { required: true, message: "必填", trigger: "blur" } | ||
| 285 | + ], | ||
| 286 | + sealType: [ | ||
| 287 | + { required: true, message: "必填", trigger: "change" } | ||
| 288 | + ], | ||
| 289 | + sealUpdateTime: [ | ||
| 290 | + { required: true, message: "必填", trigger: "blur" } | ||
| 291 | + ], | ||
| 292 | + sealEndTime: [ | ||
| 293 | + { required: true, message: "必填", trigger: "blur" } | ||
| 294 | + ], | ||
| 295 | + purpose: [ | ||
| 296 | + { required: true, message: "必填", trigger: "blur" } | ||
| 297 | + ], | ||
| 298 | + staff: [ | ||
| 299 | + { required: true, message: "必填", trigger: "blur" } | ||
| 300 | + ], | ||
| 301 | + useDate: [ | ||
| 302 | + { required: true, message: "必填", trigger: "blur" } | ||
| 303 | + ], | ||
| 304 | + goodsName: [ | ||
| 305 | + { required: true, message: "必填", trigger: "blur" } | ||
| 306 | + ], | ||
| 307 | + quantity: [ | ||
| 308 | + { required: true, message: "必填", trigger: "blur" } | ||
| 309 | + ], | ||
| 310 | + }, | ||
| 311 | + openInfo:false, | ||
| 312 | + idInfo:null, | ||
| 313 | + }; | ||
| 314 | + }, | ||
| 315 | + created() { | ||
| 316 | + this.getList(); | ||
| 317 | + }, | ||
| 318 | + methods: { | ||
| 319 | + /** 查询后勤管理列表 */ | ||
| 320 | + getList() { | ||
| 321 | + this.loading = true; | ||
| 322 | + listLogistics(this.queryParams).then(response => { | ||
| 323 | + this.logisticsList = response.rows; | ||
| 324 | + this.total = response.total; | ||
| 325 | + this.loading = false; | ||
| 326 | + }); | ||
| 327 | + }, | ||
| 328 | + // 取消按钮 | ||
| 329 | + cancel() { | ||
| 330 | + this.open = false; | ||
| 331 | + this.openInfo = false; | ||
| 332 | + this.reset(); | ||
| 333 | + }, | ||
| 334 | + // 表单重置 | ||
| 335 | + reset() { | ||
| 336 | + this.form = { | ||
| 337 | + id: null, | ||
| 338 | + type: null, | ||
| 339 | + deptId: null, | ||
| 340 | + sealType: null, | ||
| 341 | + sealUpdateTime: null, | ||
| 342 | + sealEndTime: null, | ||
| 343 | + purpose: null, | ||
| 344 | + staff: null, | ||
| 345 | + useDate: null, | ||
| 346 | + goodsName: null, | ||
| 347 | + quantity: null, | ||
| 348 | + status: 0, | ||
| 349 | + createTime: null, | ||
| 350 | + createBy: null, | ||
| 351 | + updateTime: null, | ||
| 352 | + updateBy: null | ||
| 353 | + }; | ||
| 354 | + this.resetForm("form"); | ||
| 355 | + }, | ||
| 356 | + /** 搜索按钮操作 */ | ||
| 357 | + handleQuery() { | ||
| 358 | + this.queryParams.pageNum = 1; | ||
| 359 | + this.getList(); | ||
| 360 | + }, | ||
| 361 | + /** 重置按钮操作 */ | ||
| 362 | + resetQuery() { | ||
| 363 | + this.resetForm("queryForm"); | ||
| 364 | + this.handleQuery(); | ||
| 365 | + }, | ||
| 366 | + // 多选框选中数据 | ||
| 367 | + handleSelectionChange(selection) { | ||
| 368 | + this.ids = selection.map(item => item.id) | ||
| 369 | + this.single = selection.length!==1 | ||
| 370 | + this.multiple = !selection.length | ||
| 371 | + }, | ||
| 372 | + /** 新增按钮操作 */ | ||
| 373 | + handleAdd() { | ||
| 374 | + this.reset(); | ||
| 375 | + this.open = true; | ||
| 376 | + this.title = "添加后勤管理"; | ||
| 377 | + }, | ||
| 378 | + /** 查看按钮操作 */ | ||
| 379 | + handleInfo(row){ | ||
| 380 | + this.idInfo = row.id; | ||
| 381 | + this.openInfo = true; | ||
| 382 | + this.title = "查看后勤管理"; | ||
| 383 | + }, | ||
| 384 | + /** 修改按钮操作 */ | ||
| 385 | + handleUpdate(row) { | ||
| 386 | + this.reset(); | ||
| 387 | + const id = row.id || this.ids | ||
| 388 | + getLogistics(id).then(response => { | ||
| 389 | + this.form = response.data; | ||
| 390 | + this.open = true; | ||
| 391 | + this.title = "修改后勤管理"; | ||
| 392 | + }); | ||
| 393 | + }, | ||
| 394 | + /** 提交按钮 */ | ||
| 395 | + submitForm() { | ||
| 396 | + this.$refs["form"].validate(valid => { | ||
| 397 | + if (valid) { | ||
| 398 | + if (this.form.id != null) { | ||
| 399 | + updateLogistics(this.form).then(response => { | ||
| 400 | + this.msgSuccess("修改成功"); | ||
| 401 | + this.open = false; | ||
| 402 | + this.getList(); | ||
| 403 | + }); | ||
| 404 | + } else { | ||
| 405 | + addLogistics(this.form).then(response => { | ||
| 406 | + this.msgSuccess("新增成功"); | ||
| 407 | + this.open = false; | ||
| 408 | + this.getList(); | ||
| 409 | + }); | ||
| 410 | + } | ||
| 411 | + } | ||
| 412 | + }); | ||
| 413 | + }, | ||
| 414 | + /** 删除按钮操作 */ | ||
| 415 | + handleDelete(row) { | ||
| 416 | + const ids = row.id || this.ids; | ||
| 417 | + this.$confirm('是否确认删除后勤管理编号为"' + ids + '"的数据项?', "警告", { | ||
| 418 | + confirmButtonText: "确定", | ||
| 419 | + cancelButtonText: "取消", | ||
| 420 | + type: "warning" | ||
| 421 | + }).then(function() { | ||
| 422 | + return delLogistics(ids); | ||
| 423 | + }).then(() => { | ||
| 424 | + this.getList(); | ||
| 425 | + this.msgSuccess("删除成功"); | ||
| 426 | + }) | ||
| 427 | + }, | ||
| 428 | + /** 导出按钮操作 */ | ||
| 429 | + handleExport() { | ||
| 430 | + const queryParams = this.queryParams; | ||
| 431 | + this.$confirm('是否确认导出所有后勤管理数据项?', "警告", { | ||
| 432 | + confirmButtonText: "确定", | ||
| 433 | + cancelButtonText: "取消", | ||
| 434 | + type: "warning" | ||
| 435 | + }).then(function() { | ||
| 436 | + return exportLogistics(queryParams); | ||
| 437 | + }).then(response => { | ||
| 438 | + this.download(response.msg); | ||
| 439 | + }) | ||
| 440 | + }, | ||
| 441 | + changeType(){ | ||
| 442 | + if(this.form.type=="用章申请"){ | ||
| 443 | + this.form.staff = null; | ||
| 444 | + this.form.useDate = null; | ||
| 445 | + this.form.goodsName = null; | ||
| 446 | + this.form.quantity = null; | ||
| 447 | + this.rules.sealType[0].required=true; | ||
| 448 | + this.rules.sealUpdateTime[0].required=true; | ||
| 449 | + this.rules.sealEndTime[0].required=true; | ||
| 450 | + this.rules.purpose[0].required=true; | ||
| 451 | + this.rules.staff[0].required=false; | ||
| 452 | + this.rules.useDate[0].required=false; | ||
| 453 | + this.rules.goodsName[0].required=false; | ||
| 454 | + this.rules.quantity[0].required=false; | ||
| 455 | + }else{ | ||
| 456 | + this.form.sealType = null; | ||
| 457 | + this.form.sealUpdateTime = null; | ||
| 458 | + this.form.sealEndTime = null; | ||
| 459 | + this.form.purpose = null; | ||
| 460 | + this.rules.sealType[0].required=false; | ||
| 461 | + this.rules.sealUpdateTime[0].required=false; | ||
| 462 | + this.rules.sealEndTime[0].required=false; | ||
| 463 | + this.rules.purpose[0].required=false; | ||
| 464 | + this.rules.staff[0].required=true; | ||
| 465 | + this.rules.useDate[0].required=true; | ||
| 466 | + this.rules.goodsName[0].required=true; | ||
| 467 | + this.rules.quantity[0].required=true; | ||
| 468 | + } | ||
| 469 | + } | ||
| 470 | + } | ||
| 471 | +}; | ||
| 472 | +</script> |
trash-ui/src/views/office/logistics/logisticsInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||
| 3 | + <el-form-item label="申请类型" prop="type"> | ||
| 4 | + <el-select v-model="form.type" placeholder="请选择申请类型" style="width: 100%"> | ||
| 5 | + <el-option label="用章申请" value="用章申请" /> | ||
| 6 | + <el-option label="物品申请" value="物品申请" /> | ||
| 7 | + <el-option label="物品采购申请" value="物品采购申请" /> | ||
| 8 | + </el-select> | ||
| 9 | + </el-form-item> | ||
| 10 | + <el-form-item label="申请部门" prop="deptId"> | ||
| 11 | + <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%"> | ||
| 12 | + <el-option label="部门1" value="1" /> | ||
| 13 | + <el-option label="部门2" value="2" /> | ||
| 14 | + </el-select> | ||
| 15 | + </el-form-item> | ||
| 16 | + <el-form-item label="用章类型" prop="sealType" v-if="form.type=='用章申请'"> | ||
| 17 | + <el-select v-model="form.sealType" placeholder="请选择用章类型" style="width: 100%"> | ||
| 18 | + <el-option label="用章类型1" value="用章类型1" /> | ||
| 19 | + <el-option label="用章类型2" value="用章类型2" /> | ||
| 20 | + </el-select> | ||
| 21 | + </el-form-item> | ||
| 22 | + <el-form-item label="更新时间" prop="sealUpdateTime" v-if="form.type=='用章申请'"> | ||
| 23 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 24 | + v-model="form.sealUpdateTime" | ||
| 25 | + type="date" | ||
| 26 | + value-format="yyyy-MM-dd" | ||
| 27 | + placeholder="选择更新时间"> | ||
| 28 | + </el-date-picker> | ||
| 29 | + </el-form-item> | ||
| 30 | + <el-form-item label="结束时间" prop="sealEndTime" v-if="form.type=='用章申请'"> | ||
| 31 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 32 | + v-model="form.sealEndTime" | ||
| 33 | + type="date" | ||
| 34 | + value-format="yyyy-MM-dd" | ||
| 35 | + placeholder="选择结束时间"> | ||
| 36 | + </el-date-picker> | ||
| 37 | + </el-form-item> | ||
| 38 | + <el-form-item label="用途" prop="purpose" v-if="form.type=='用章申请'"> | ||
| 39 | + <el-input v-model="form.purpose" type="textarea" placeholder="请输入内容" :row="4"/> | ||
| 40 | + </el-form-item> | ||
| 41 | + <el-form-item label="申请人" prop="staff" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 42 | + <el-input v-model="form.staff" placeholder="请输入申请人" /> | ||
| 43 | + </el-form-item> | ||
| 44 | + <el-form-item label="申请日期" prop="useDate" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 45 | + <el-date-picker clearable size="small" style="width: 100%" | ||
| 46 | + v-model="form.useDate" | ||
| 47 | + type="date" | ||
| 48 | + value-format="yyyy-MM-dd" | ||
| 49 | + placeholder="选择申请日期"> | ||
| 50 | + </el-date-picker> | ||
| 51 | + </el-form-item> | ||
| 52 | + <el-form-item label="物品名称" prop="goodsName" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 53 | + <el-input v-model="form.goodsName" placeholder="请输入物品名称" /> | ||
| 54 | + </el-form-item> | ||
| 55 | + <el-form-item label="数量" prop="quantity" v-if="form.type!='用章申请' && form.type!=null"> | ||
| 56 | + <el-input v-model="form.quantity" placeholder="请输入数量" | ||
| 57 | + @input="form.quantity=form.quantity.replace(/[^0-9]/g,'');" | ||
| 58 | + /> | ||
| 59 | + </el-form-item> | ||
| 60 | + </el-form> | ||
| 61 | +</template> | ||
| 62 | + | ||
| 63 | +<script> | ||
| 64 | +import {getLogistics} from "@/api/office/logistics"; | ||
| 65 | +export default { | ||
| 66 | + name: "logisticsInfo", | ||
| 67 | + props: { | ||
| 68 | + businessKey: { | ||
| 69 | + type: String | ||
| 70 | + }, | ||
| 71 | + idInfo: { | ||
| 72 | + type: Number | ||
| 73 | + } | ||
| 74 | + }, | ||
| 75 | + data() { | ||
| 76 | + return { | ||
| 77 | + form: {} | ||
| 78 | + } | ||
| 79 | + }, | ||
| 80 | + created() { | ||
| 81 | + this.init(); | ||
| 82 | + }, | ||
| 83 | + methods:{ | ||
| 84 | + init(){ | ||
| 85 | + getLogistics(this.idInfo).then(response => { | ||
| 86 | + this.form = response.data | ||
| 87 | + }); | ||
| 88 | + } | ||
| 89 | + } | ||
| 90 | +} | ||
| 91 | +</script> | ||
| 92 | + | ||
| 93 | +<style scoped> | ||
| 94 | + | ||
| 95 | +</style> |
trash-ui/src/views/office/management/contractInfo.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-form ref="form" :model="form" label-width="105px"> | ||
| 3 | + <el-row :gutter="2"> | ||
| 4 | + <el-col :span="11"> | ||
| 5 | + <el-form-item label="合同编号" prop="contractNumber"> | ||
| 6 | + <el-input v-model="form.contractNumber" placeholder="请输入合同编号" :disabled="true"/> | ||
| 7 | + </el-form-item> | ||
| 8 | + </el-col> | ||
| 9 | + <el-col :span="11"> | ||
| 10 | + <el-form-item label="合同名称" prop="contractName"> | ||
| 11 | + <el-input v-model="form.contractName" placeholder="请输入合同名称" :disabled="true"/> | ||
| 12 | + </el-form-item> | ||
| 13 | + </el-col> | ||
| 14 | + </el-row> | ||
| 15 | + <el-row :gutter="2"> | ||
| 16 | + <el-col :span="11"> | ||
| 17 | + <el-form-item label="甲方" prop="firstParty"> | ||
| 18 | + <el-input v-model="form.firstParty" placeholder="请输入甲方" :disabled="true"/> | ||
| 19 | + </el-form-item> | ||
| 20 | + </el-col> | ||
| 21 | + <el-col :span="11"> | ||
| 22 | + <el-form-item label="乙方" prop="secondParty"> | ||
| 23 | + <el-input v-model="form.secondParty" placeholder="请输入乙方" :disabled="true"/> | ||
| 24 | + </el-form-item> | ||
| 25 | + </el-col> | ||
| 26 | + </el-row> | ||
| 27 | + <el-row :gutter="2"> | ||
| 28 | + <el-col :span="11"> | ||
| 29 | + <el-form-item label="开始时间" prop="contractBeginDate"> | ||
| 30 | + <el-date-picker clearable size="small" style="width: 100%;" | ||
| 31 | + v-model="form.contractBeginDate" | ||
| 32 | + type="date" | ||
| 33 | + value-format="yyyy-MM-dd" | ||
| 34 | + :disabled="true" | ||
| 35 | + placeholder="选择合同开始时间"> | ||
| 36 | + </el-date-picker> | ||
| 37 | + </el-form-item> | ||
| 38 | + </el-col> | ||
| 39 | + <el-col :span="11"> | ||
| 40 | + <el-form-item label="结束时间" prop="contractEndDate"> | ||
| 41 | + <el-date-picker clearable size="small" style="width: 100%;" | ||
| 42 | + v-model="form.contractEndDate" | ||
| 43 | + type="date" | ||
| 44 | + value-format="yyyy-MM-dd" | ||
| 45 | + :disabled="true" | ||
| 46 | + placeholder="选择合同结束时间"> | ||
| 47 | + </el-date-picker> | ||
| 48 | + </el-form-item> | ||
| 49 | + </el-col> | ||
| 50 | + </el-row> | ||
| 51 | + <el-row :gutter="2"> | ||
| 52 | + <el-col :span="11"> | ||
| 53 | + <el-form-item label="合同金额" prop="contractMoney"> | ||
| 54 | + <el-input v-model="form.contractMoney" | ||
| 55 | + :disabled="true" | ||
| 56 | + @input="form.contractMoney=form.contractMoney.replace(/[^0-9.]/g,'').replace(/^\./g, '').replace('.', 'dollar#dollar').replace(/\./g, '').replace('dollar#dollar', '.');" | ||
| 57 | + placeholder="请输入合同金额"/> | ||
| 58 | + </el-form-item> | ||
| 59 | + </el-col> | ||
| 60 | + <el-col :span="11"> | ||
| 61 | + <el-form-item label="合同状态" prop="contractState"> | ||
| 62 | + <el-select v-model="form.contractState" placeholder="请选择状态" style="width: 100%;" :disabled="true"> | ||
| 63 | + <el-option label="正常" value="正常"/> | ||
| 64 | + <el-option label="到期" value="到期"/> | ||
| 65 | + <el-option label="终止" value="终止"/> | ||
| 66 | + </el-select> | ||
| 67 | + </el-form-item> | ||
| 68 | + </el-col> | ||
| 69 | + </el-row> | ||
| 70 | + <el-row :gutter="2"> | ||
| 71 | + <el-col :span="11"> | ||
| 72 | + <el-form-item label="责任科室" prop="deptname"> | ||
| 73 | + <el-select v-model="form.deptname" placeholder="请选择责任科室" style="width: 100%;" :disabled="true"> | ||
| 74 | + <el-option label="科室1" value="科室1"/> | ||
| 75 | + <el-option label="科室2" value="科室2"/> | ||
| 76 | + <el-option label="科室3" value="科室3"/> | ||
| 77 | + </el-select> | ||
| 78 | + </el-form-item> | ||
| 79 | + </el-col> | ||
| 80 | + </el-row> | ||
| 81 | + <el-row> | ||
| 82 | + <el-table :data="fileEntityList"> | ||
| 83 | + <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column> | ||
| 84 | + <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center"> | ||
| 85 | + <template slot-scope="scope"> | ||
| 86 | + <el-button | ||
| 87 | + size="small" type="success" | ||
| 88 | + icon="el-icon-download" | ||
| 89 | + @click="downloadFA(scope.row)" | ||
| 90 | + v-hasPermi="['office:management:edit']" | ||
| 91 | + v-if="form.id!=null" | ||
| 92 | + round>下载 | ||
| 93 | + </el-button> | ||
| 94 | + </template> | ||
| 95 | + </el-table-column> | ||
| 96 | + </el-table> | ||
| 97 | + </el-row> | ||
| 98 | + </el-form> | ||
| 99 | +</template> | ||
| 100 | + | ||
| 101 | +<script> | ||
| 102 | +import {getManagement} from "@/api/office/management"; | ||
| 103 | +export default { | ||
| 104 | + name: "contractInfo", | ||
| 105 | + props: { | ||
| 106 | + businessKey: { | ||
| 107 | + type: String | ||
| 108 | + }, | ||
| 109 | + idInfo: { | ||
| 110 | + type: Number | ||
| 111 | + } | ||
| 112 | + }, | ||
| 113 | + data() { | ||
| 114 | + return { | ||
| 115 | + form: {}, | ||
| 116 | + fileEntityList:[] | ||
| 117 | + } | ||
| 118 | + }, | ||
| 119 | + created() { | ||
| 120 | + this.init(); | ||
| 121 | + }, | ||
| 122 | + methods:{ | ||
| 123 | + init(){ | ||
| 124 | + getManagement(this.idInfo).then(response => { | ||
| 125 | + this.form = response.data.contractManagement; | ||
| 126 | + let files = JSON.stringify(response.data.uploadFiles); | ||
| 127 | + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")) | ||
| 128 | + }); | ||
| 129 | + }, | ||
| 130 | + /** 文件下载 */ | ||
| 131 | + downloadFA(row) { | ||
| 132 | + let name = row.name; | ||
| 133 | + let url = row.url; | ||
| 134 | + const a = document.createElement('a') | ||
| 135 | + a.setAttribute('download', name) | ||
| 136 | + a.setAttribute('target', '_blank') | ||
| 137 | + a.setAttribute('href', process.env.VUE_APP_BASE_API + url); | ||
| 138 | + a.click() | ||
| 139 | + }, | ||
| 140 | + } | ||
| 141 | +} | ||
| 142 | +</script> | ||
| 143 | + | ||
| 144 | +<style scoped> | ||
| 145 | + | ||
| 146 | +</style> |
trash-ui/src/views/office/management/index.vue
| @@ -54,22 +54,18 @@ | @@ -54,22 +54,18 @@ | ||
| 54 | </el-date-picker> | 54 | </el-date-picker> |
| 55 | </el-form-item> | 55 | </el-form-item> |
| 56 | <el-form-item label="合同状态" prop="contractState"> | 56 | <el-form-item label="合同状态" prop="contractState"> |
| 57 | - <el-input | ||
| 58 | - v-model="queryParams.contractState" | ||
| 59 | - placeholder="请输入合同状态" | ||
| 60 | - clearable | ||
| 61 | - size="small" | ||
| 62 | - @keyup.enter.native="handleQuery" | ||
| 63 | - /> | 57 | + <el-select v-model="form.contractState" placeholder="请选择状态" style="width: 100%;"> |
| 58 | + <el-option label="正常" value="正常"/> | ||
| 59 | + <el-option label="到期" value="到期"/> | ||
| 60 | + <el-option label="终止" value="终止"/> | ||
| 61 | + </el-select> | ||
| 64 | </el-form-item> | 62 | </el-form-item> |
| 65 | <el-form-item label="责任科室" prop="deptname"> | 63 | <el-form-item label="责任科室" prop="deptname"> |
| 66 | - <el-input | ||
| 67 | - v-model="queryParams.deptname" | ||
| 68 | - placeholder="请输入责任科室" | ||
| 69 | - clearable | ||
| 70 | - size="small" | ||
| 71 | - @keyup.enter.native="handleQuery" | ||
| 72 | - /> | 64 | + <el-select v-model="queryParams.deptname" placeholder="请选择责任科室" style="width: 100%;"> |
| 65 | + <el-option label="科室1" value="科室1"/> | ||
| 66 | + <el-option label="科室2" value="科室2"/> | ||
| 67 | + <el-option label="科室3" value="科室3"/> | ||
| 68 | + </el-select> | ||
| 73 | </el-form-item> | 69 | </el-form-item> |
| 74 | <el-form-item> | 70 | <el-form-item> |
| 75 | <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | 71 | <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> |
| @@ -147,6 +143,14 @@ | @@ -147,6 +143,14 @@ | ||
| 147 | <el-button | 143 | <el-button |
| 148 | size="mini" | 144 | size="mini" |
| 149 | type="text" | 145 | type="text" |
| 146 | + icon="el-icon-view" | ||
| 147 | + @click="handleInfo(scope.row)" | ||
| 148 | + v-hasPermi="['office:management:edit']" | ||
| 149 | + >详情 | ||
| 150 | + </el-button> | ||
| 151 | + <el-button | ||
| 152 | + size="mini" | ||
| 153 | + type="text" | ||
| 150 | icon="el-icon-edit" | 154 | icon="el-icon-edit" |
| 151 | @click="handleUpdate(scope.row)" | 155 | @click="handleUpdate(scope.row)" |
| 152 | v-hasPermi="['office:management:edit']" | 156 | v-hasPermi="['office:management:edit']" |
| @@ -295,6 +299,12 @@ | @@ -295,6 +299,12 @@ | ||
| 295 | <el-button @click="cancel">取 消</el-button> | 299 | <el-button @click="cancel">取 消</el-button> |
| 296 | </div> | 300 | </div> |
| 297 | </el-dialog> | 301 | </el-dialog> |
| 302 | + <el-dialog :title="title" :visible.sync="openInfo"> | ||
| 303 | + <contractInfo :idInfo="idInfo" v-if="openInfo"/> | ||
| 304 | + <div slot="footer" class="dialog-footer"> | ||
| 305 | + <el-button @click="cancel">取 消</el-button> | ||
| 306 | + </div> | ||
| 307 | + </el-dialog> | ||
| 298 | </div> | 308 | </div> |
| 299 | </template> | 309 | </template> |
| 300 | 310 | ||
| @@ -308,11 +318,13 @@ import { | @@ -308,11 +318,13 @@ import { | ||
| 308 | exportManagement | 318 | exportManagement |
| 309 | } from "@/api/office/management"; | 319 | } from "@/api/office/management"; |
| 310 | import FileUpload from '@/components/FileUpload'; | 320 | import FileUpload from '@/components/FileUpload'; |
| 321 | +import contractInfo from './contractInfo'; | ||
| 311 | 322 | ||
| 312 | export default { | 323 | export default { |
| 313 | name: "Management", | 324 | name: "Management", |
| 314 | - comments: { | ||
| 315 | - FileUpload | 325 | + components: { |
| 326 | + FileUpload, | ||
| 327 | + contractInfo | ||
| 316 | }, | 328 | }, |
| 317 | data() { | 329 | data() { |
| 318 | return { | 330 | return { |
| @@ -382,7 +394,9 @@ export default { | @@ -382,7 +394,9 @@ export default { | ||
| 382 | {required: true, message: "请输入责任科室", trigger: "blur"} | 394 | {required: true, message: "请输入责任科室", trigger: "blur"} |
| 383 | ], | 395 | ], |
| 384 | }, | 396 | }, |
| 385 | - fileEntityList: [] | 397 | + fileEntityList: [], |
| 398 | + openInfo: false, | ||
| 399 | + idInfo:null, | ||
| 386 | }; | 400 | }; |
| 387 | }, | 401 | }, |
| 388 | created() { | 402 | created() { |
| @@ -401,6 +415,7 @@ export default { | @@ -401,6 +415,7 @@ export default { | ||
| 401 | // 取消按钮 | 415 | // 取消按钮 |
| 402 | cancel() { | 416 | cancel() { |
| 403 | this.open = false; | 417 | this.open = false; |
| 418 | + this.openInfo = false; | ||
| 404 | this.reset(); | 419 | this.reset(); |
| 405 | }, | 420 | }, |
| 406 | // 表单重置 | 421 | // 表单重置 |
| @@ -438,6 +453,13 @@ export default { | @@ -438,6 +453,13 @@ export default { | ||
| 438 | this.single = selection.length !== 1 | 453 | this.single = selection.length !== 1 |
| 439 | this.multiple = !selection.length | 454 | this.multiple = !selection.length |
| 440 | }, | 455 | }, |
| 456 | + /** 查看按钮操作 */ | ||
| 457 | + handleInfo(row){ | ||
| 458 | + this.reset(); | ||
| 459 | + this.idInfo = row.id; | ||
| 460 | + this.title = "请假申请详情"; | ||
| 461 | + this.openInfo = true; | ||
| 462 | + }, | ||
| 441 | /** 新增按钮操作 */ | 463 | /** 新增按钮操作 */ |
| 442 | handleAdd() { | 464 | handleAdd() { |
| 443 | this.reset(); | 465 | this.reset(); |
| @@ -462,8 +484,10 @@ export default { | @@ -462,8 +484,10 @@ export default { | ||
| 462 | if (valid) { | 484 | if (valid) { |
| 463 | let formData = new FormData(); | 485 | let formData = new FormData(); |
| 464 | let form = this.form; | 486 | let form = this.form; |
| 487 | + //去掉params属性 | ||
| 465 | delete form.params; | 488 | delete form.params; |
| 466 | formData.append('fileList', null); | 489 | formData.append('fileList', null); |
| 490 | + //将新增的文件放入formData | ||
| 467 | this.fileEntityList.forEach(item => { | 491 | this.fileEntityList.forEach(item => { |
| 468 | if(item.id==null){ | 492 | if(item.id==null){ |
| 469 | formData.append('fileList', item.raw) | 493 | formData.append('fileList', item.raw) |
| @@ -473,7 +497,6 @@ export default { | @@ -473,7 +497,6 @@ export default { | ||
| 473 | formData.append("contractManagement", JSON.stringify(form)); | 497 | formData.append("contractManagement", JSON.stringify(form)); |
| 474 | formData.append("uploadFilesList", null); | 498 | formData.append("uploadFilesList", null); |
| 475 | this.fileEntityList.forEach(item => { | 499 | this.fileEntityList.forEach(item => { |
| 476 | - //去掉params属性 | ||
| 477 | delete item.params; | 500 | delete item.params; |
| 478 | if(item != "null" && item != null){ | 501 | if(item != "null" && item != null){ |
| 479 | formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); | 502 | formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName")); |
trash-workFlow/src/main/java/com/trash/business/mapper/CompanyCreditMapper.java
| @@ -12,7 +12,7 @@ public interface CompanyCreditMapper { | @@ -12,7 +12,7 @@ public interface CompanyCreditMapper { | ||
| 12 | * @param id 企业失信ID | 12 | * @param id 企业失信ID |
| 13 | * @return 企业失信 | 13 | * @return 企业失信 |
| 14 | */ | 14 | */ |
| 15 | - public CompanyCredit selectCompanyCreditById(Long id); | 15 | + CompanyCredit selectCompanyCreditById(Long id); |
| 16 | 16 | ||
| 17 | /** | 17 | /** |
| 18 | * 查询企业失信列表 | 18 | * 查询企业失信列表 |
| @@ -20,7 +20,7 @@ public interface CompanyCreditMapper { | @@ -20,7 +20,7 @@ public interface CompanyCreditMapper { | ||
| 20 | * @param companyCredit 企业失信 | 20 | * @param companyCredit 企业失信 |
| 21 | * @return 企业失信集合 | 21 | * @return 企业失信集合 |
| 22 | */ | 22 | */ |
| 23 | - public List<CompanyCredit> selectCompanyCreditList(CompanyCredit companyCredit); | 23 | + List<CompanyCredit> selectCompanyCreditList(CompanyCredit companyCredit); |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * 新增企业失信 | 26 | * 新增企业失信 |
| @@ -28,7 +28,7 @@ public interface CompanyCreditMapper { | @@ -28,7 +28,7 @@ public interface CompanyCreditMapper { | ||
| 28 | * @param companyCredit 企业失信 | 28 | * @param companyCredit 企业失信 |
| 29 | * @return 结果 | 29 | * @return 结果 |
| 30 | */ | 30 | */ |
| 31 | - public int insertCompanyCredit(CompanyCredit companyCredit); | 31 | + int insertCompanyCredit(CompanyCredit companyCredit); |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 修改企业失信 | 34 | * 修改企业失信 |
| @@ -36,7 +36,7 @@ public interface CompanyCreditMapper { | @@ -36,7 +36,7 @@ public interface CompanyCreditMapper { | ||
| 36 | * @param companyCredit 企业失信 | 36 | * @param companyCredit 企业失信 |
| 37 | * @return 结果 | 37 | * @return 结果 |
| 38 | */ | 38 | */ |
| 39 | - public int updateCompanyCredit(CompanyCredit companyCredit); | 39 | + int updateCompanyCredit(CompanyCredit companyCredit); |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 删除企业失信 | 42 | * 删除企业失信 |
| @@ -44,7 +44,7 @@ public interface CompanyCreditMapper { | @@ -44,7 +44,7 @@ public interface CompanyCreditMapper { | ||
| 44 | * @param id 企业失信ID | 44 | * @param id 企业失信ID |
| 45 | * @return 结果 | 45 | * @return 结果 |
| 46 | */ | 46 | */ |
| 47 | - public int deleteCompanyCreditById(Long id); | 47 | + int deleteCompanyCreditById(Long id); |
| 48 | 48 | ||
| 49 | /** | 49 | /** |
| 50 | * 批量删除企业失信 | 50 | * 批量删除企业失信 |
| @@ -52,11 +52,11 @@ public interface CompanyCreditMapper { | @@ -52,11 +52,11 @@ public interface CompanyCreditMapper { | ||
| 52 | * @param ids 需要删除的数据ID | 52 | * @param ids 需要删除的数据ID |
| 53 | * @return 结果 | 53 | * @return 结果 |
| 54 | */ | 54 | */ |
| 55 | - public int deleteCompanyCreditByIds(Long[] ids); | 55 | + int deleteCompanyCreditByIds(Long[] ids); |
| 56 | 56 | ||
| 57 | - public List<String> getNames(CompanyCredit companyCredit); | 57 | + List<String> getNames(CompanyCredit companyCredit); |
| 58 | 58 | ||
| 59 | - public List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit); | 59 | + List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit); |
| 60 | 60 | ||
| 61 | public List<String> getPlaces(CompanyCredit companyCredit); | 61 | public List<String> getPlaces(CompanyCredit companyCredit); |
| 62 | } | 62 | } |
trash-workFlow/src/main/java/com/trash/business/mapper/ConstructionCreditMapper.java
| @@ -18,7 +18,7 @@ public interface ConstructionCreditMapper | @@ -18,7 +18,7 @@ public interface ConstructionCreditMapper | ||
| 18 | * @param id 三查机制ID | 18 | * @param id 三查机制ID |
| 19 | * @return 三查机制 | 19 | * @return 三查机制 |
| 20 | */ | 20 | */ |
| 21 | - public ConstructionCredit selectConstructionCreditById(Long id); | 21 | + ConstructionCredit selectConstructionCreditById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询三查机制列表 | 24 | * 查询三查机制列表 |
| @@ -26,7 +26,7 @@ public interface ConstructionCreditMapper | @@ -26,7 +26,7 @@ public interface ConstructionCreditMapper | ||
| 26 | * @param constructionCredit 三查机制 | 26 | * @param constructionCredit 三查机制 |
| 27 | * @return 三查机制集合 | 27 | * @return 三查机制集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit); | 29 | + List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增三查机制 | 32 | * 新增三查机制 |
| @@ -34,7 +34,7 @@ public interface ConstructionCreditMapper | @@ -34,7 +34,7 @@ public interface ConstructionCreditMapper | ||
| 34 | * @param constructionCredit 三查机制 | 34 | * @param constructionCredit 三查机制 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertConstructionCredit(ConstructionCredit constructionCredit); | 37 | + int insertConstructionCredit(ConstructionCredit constructionCredit); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改三查机制 | 40 | * 修改三查机制 |
| @@ -42,7 +42,7 @@ public interface ConstructionCreditMapper | @@ -42,7 +42,7 @@ public interface ConstructionCreditMapper | ||
| 42 | * @param constructionCredit 三查机制 | 42 | * @param constructionCredit 三查机制 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateConstructionCredit(ConstructionCredit constructionCredit); | 45 | + int updateConstructionCredit(ConstructionCredit constructionCredit); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除三查机制 | 48 | * 删除三查机制 |
| @@ -50,7 +50,7 @@ public interface ConstructionCreditMapper | @@ -50,7 +50,7 @@ public interface ConstructionCreditMapper | ||
| 50 | * @param id 三查机制ID | 50 | * @param id 三查机制ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteConstructionCreditById(Long id); | 53 | + int deleteConstructionCreditById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除三查机制 | 56 | * 批量删除三查机制 |
| @@ -58,13 +58,13 @@ public interface ConstructionCreditMapper | @@ -58,13 +58,13 @@ public interface ConstructionCreditMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteConstructionCreditByIds(Long[] ids); | 61 | + int deleteConstructionCreditByIds(Long[] ids); |
| 62 | 62 | ||
| 63 | - public List<String> getNames(ConstructionCredit constructionCredit); | 63 | + List<String> getNames(ConstructionCredit constructionCredit); |
| 64 | 64 | ||
| 65 | - public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit); | 65 | + List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit); |
| 66 | 66 | ||
| 67 | - public List<String> getTypes(ConstructionCredit constructionCredit); | 67 | + List<String> getTypes(ConstructionCredit constructionCredit); |
| 68 | 68 | ||
| 69 | - public List<String> getPlaces(ConstructionCredit constructionCredit); | 69 | + List<String> getPlaces(ConstructionCredit constructionCredit); |
| 70 | } | 70 | } |
trash-workFlow/src/main/java/com/trash/business/mapper/DriverCreditMapper.java
| @@ -18,7 +18,7 @@ public interface DriverCreditMapper | @@ -18,7 +18,7 @@ public interface DriverCreditMapper | ||
| 18 | * @param id 驾驶员失信ID | 18 | * @param id 驾驶员失信ID |
| 19 | * @return 驾驶员失信 | 19 | * @return 驾驶员失信 |
| 20 | */ | 20 | */ |
| 21 | - public DriverCredit selectDriverCreditById(Long id); | 21 | + DriverCredit selectDriverCreditById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询驾驶员失信列表 | 24 | * 查询驾驶员失信列表 |
| @@ -26,7 +26,7 @@ public interface DriverCreditMapper | @@ -26,7 +26,7 @@ public interface DriverCreditMapper | ||
| 26 | * @param driverCredit 驾驶员失信 | 26 | * @param driverCredit 驾驶员失信 |
| 27 | * @return 驾驶员失信集合 | 27 | * @return 驾驶员失信集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit); | 29 | + List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增驾驶员失信 | 32 | * 新增驾驶员失信 |
| @@ -34,7 +34,7 @@ public interface DriverCreditMapper | @@ -34,7 +34,7 @@ public interface DriverCreditMapper | ||
| 34 | * @param driverCredit 驾驶员失信 | 34 | * @param driverCredit 驾驶员失信 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertDriverCredit(DriverCredit driverCredit); | 37 | + int insertDriverCredit(DriverCredit driverCredit); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改驾驶员失信 | 40 | * 修改驾驶员失信 |
| @@ -42,7 +42,7 @@ public interface DriverCreditMapper | @@ -42,7 +42,7 @@ public interface DriverCreditMapper | ||
| 42 | * @param driverCredit 驾驶员失信 | 42 | * @param driverCredit 驾驶员失信 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateDriverCredit(DriverCredit driverCredit); | 45 | + int updateDriverCredit(DriverCredit driverCredit); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除驾驶员失信 | 48 | * 删除驾驶员失信 |
| @@ -50,7 +50,7 @@ public interface DriverCreditMapper | @@ -50,7 +50,7 @@ public interface DriverCreditMapper | ||
| 50 | * @param id 驾驶员失信ID | 50 | * @param id 驾驶员失信ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteDriverCreditById(Long id); | 53 | + int deleteDriverCreditById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除驾驶员失信 | 56 | * 批量删除驾驶员失信 |
| @@ -58,9 +58,9 @@ public interface DriverCreditMapper | @@ -58,9 +58,9 @@ public interface DriverCreditMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteDriverCreditByIds(Long[] ids); | 61 | + int deleteDriverCreditByIds(Long[] ids); |
| 62 | 62 | ||
| 63 | - public List<String> getNames(DriverCredit driverCredit); | 63 | + List<String> getNames(DriverCredit driverCredit); |
| 64 | 64 | ||
| 65 | - public List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit); | 65 | + List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit); |
| 66 | } | 66 | } |
| 67 | \ No newline at end of file | 67 | \ No newline at end of file |
trash-workFlow/src/main/java/com/trash/business/mapper/EarthsitesCreditMapper.java
| @@ -19,7 +19,7 @@ public interface EarthsitesCreditMapper | @@ -19,7 +19,7 @@ public interface EarthsitesCreditMapper | ||
| 19 | * @param id 消纳场失信ID | 19 | * @param id 消纳场失信ID |
| 20 | * @return 消纳场失信 | 20 | * @return 消纳场失信 |
| 21 | */ | 21 | */ |
| 22 | - public EarthsitesCredit selectEarthsitesCreditById(Long id); | 22 | + EarthsitesCredit selectEarthsitesCreditById(Long id); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 查询消纳场失信列表 | 25 | * 查询消纳场失信列表 |
| @@ -27,7 +27,7 @@ public interface EarthsitesCreditMapper | @@ -27,7 +27,7 @@ public interface EarthsitesCreditMapper | ||
| 27 | * @param earthsitesCredit 消纳场失信 | 27 | * @param earthsitesCredit 消纳场失信 |
| 28 | * @return 消纳场失信集合 | 28 | * @return 消纳场失信集合 |
| 29 | */ | 29 | */ |
| 30 | - public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit); | 30 | + List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 新增消纳场失信 | 33 | * 新增消纳场失信 |
| @@ -35,7 +35,7 @@ public interface EarthsitesCreditMapper | @@ -35,7 +35,7 @@ public interface EarthsitesCreditMapper | ||
| 35 | * @param earthsitesCredit 消纳场失信 | 35 | * @param earthsitesCredit 消纳场失信 |
| 36 | * @return 结果 | 36 | * @return 结果 |
| 37 | */ | 37 | */ |
| 38 | - public int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit); | 38 | + int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 修改消纳场失信 | 41 | * 修改消纳场失信 |
| @@ -43,7 +43,7 @@ public interface EarthsitesCreditMapper | @@ -43,7 +43,7 @@ public interface EarthsitesCreditMapper | ||
| 43 | * @param earthsitesCredit 消纳场失信 | 43 | * @param earthsitesCredit 消纳场失信 |
| 44 | * @return 结果 | 44 | * @return 结果 |
| 45 | */ | 45 | */ |
| 46 | - public int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit); | 46 | + int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 删除消纳场失信 | 49 | * 删除消纳场失信 |
| @@ -51,7 +51,7 @@ public interface EarthsitesCreditMapper | @@ -51,7 +51,7 @@ public interface EarthsitesCreditMapper | ||
| 51 | * @param id 消纳场失信ID | 51 | * @param id 消纳场失信ID |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int deleteEarthsitesCreditById(Long id); | 54 | + int deleteEarthsitesCreditById(Long id); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 批量删除消纳场失信 | 57 | * 批量删除消纳场失信 |
| @@ -59,13 +59,13 @@ public interface EarthsitesCreditMapper | @@ -59,13 +59,13 @@ public interface EarthsitesCreditMapper | ||
| 59 | * @param ids 需要删除的数据ID | 59 | * @param ids 需要删除的数据ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteEarthsitesCreditByIds(Long[] ids); | 62 | + int deleteEarthsitesCreditByIds(Long[] ids); |
| 63 | 63 | ||
| 64 | - public List<String> getNames(EarthsitesCredit earthsitesCredit); | 64 | + List<String> getNames(EarthsitesCredit earthsitesCredit); |
| 65 | 65 | ||
| 66 | public List<String> getTypes(EarthsitesCredit earthsitesCredit); | 66 | public List<String> getTypes(EarthsitesCredit earthsitesCredit); |
| 67 | 67 | ||
| 68 | public List<String> getPlaces(EarthsitesCredit earthsitesCredit); | 68 | public List<String> getPlaces(EarthsitesCredit earthsitesCredit); |
| 69 | 69 | ||
| 70 | - public List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit); | 70 | + List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit); |
| 71 | } | 71 | } |
| 72 | \ No newline at end of file | 72 | \ No newline at end of file |
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionThreestepMapper.java
| @@ -19,7 +19,7 @@ public interface SupervisionThreestepMapper | @@ -19,7 +19,7 @@ public interface SupervisionThreestepMapper | ||
| 19 | * @param id 三查机制ID | 19 | * @param id 三查机制ID |
| 20 | * @return 三查机制 | 20 | * @return 三查机制 |
| 21 | */ | 21 | */ |
| 22 | - public SupervisionThreestep selectSupervisionThreestepById(Long id); | 22 | + SupervisionThreestep selectSupervisionThreestepById(Long id); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 查询三查机制列表 | 25 | * 查询三查机制列表 |
| @@ -27,7 +27,7 @@ public interface SupervisionThreestepMapper | @@ -27,7 +27,7 @@ public interface SupervisionThreestepMapper | ||
| 27 | * @param supervisionThreestep 三查机制 | 27 | * @param supervisionThreestep 三查机制 |
| 28 | * @return 三查机制集合 | 28 | * @return 三查机制集合 |
| 29 | */ | 29 | */ |
| 30 | - public List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep); | 30 | + List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 新增三查机制 | 33 | * 新增三查机制 |
| @@ -35,7 +35,7 @@ public interface SupervisionThreestepMapper | @@ -35,7 +35,7 @@ public interface SupervisionThreestepMapper | ||
| 35 | * @param supervisionThreestep 三查机制 | 35 | * @param supervisionThreestep 三查机制 |
| 36 | * @return 结果 | 36 | * @return 结果 |
| 37 | */ | 37 | */ |
| 38 | - public int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep); | 38 | + int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 修改三查机制 | 41 | * 修改三查机制 |
| @@ -43,7 +43,7 @@ public interface SupervisionThreestepMapper | @@ -43,7 +43,7 @@ public interface SupervisionThreestepMapper | ||
| 43 | * @param supervisionThreestep 三查机制 | 43 | * @param supervisionThreestep 三查机制 |
| 44 | * @return 结果 | 44 | * @return 结果 |
| 45 | */ | 45 | */ |
| 46 | - public int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep); | 46 | + int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 删除三查机制 | 49 | * 删除三查机制 |
| @@ -51,7 +51,7 @@ public interface SupervisionThreestepMapper | @@ -51,7 +51,7 @@ public interface SupervisionThreestepMapper | ||
| 51 | * @param id 三查机制ID | 51 | * @param id 三查机制ID |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int deleteSupervisionThreestepById(Long id); | 54 | + int deleteSupervisionThreestepById(Long id); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 批量删除三查机制 | 57 | * 批量删除三查机制 |
| @@ -59,7 +59,7 @@ public interface SupervisionThreestepMapper | @@ -59,7 +59,7 @@ public interface SupervisionThreestepMapper | ||
| 59 | * @param ids 需要删除的数据ID | 59 | * @param ids 需要删除的数据ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteSupervisionThreestepByIds(Long[] ids); | 62 | + int deleteSupervisionThreestepByIds(Long[] ids); |
| 63 | 63 | ||
| 64 | public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep); | 64 | public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep); |
| 65 | 65 |
trash-workFlow/src/main/java/com/trash/business/mapper/TruckCreditMapper.java
| @@ -18,7 +18,7 @@ public interface TruckCreditMapper | @@ -18,7 +18,7 @@ public interface TruckCreditMapper | ||
| 18 | * @param id 车辆失信ID | 18 | * @param id 车辆失信ID |
| 19 | * @return 车辆失信 | 19 | * @return 车辆失信 |
| 20 | */ | 20 | */ |
| 21 | - public TruckCredit selectTruckCreditById(Long id); | 21 | + TruckCredit selectTruckCreditById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询车辆失信列表 | 24 | * 查询车辆失信列表 |
| @@ -26,7 +26,7 @@ public interface TruckCreditMapper | @@ -26,7 +26,7 @@ public interface TruckCreditMapper | ||
| 26 | * @param truckCredit 车辆失信 | 26 | * @param truckCredit 车辆失信 |
| 27 | * @return 车辆失信集合 | 27 | * @return 车辆失信集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit); | 29 | + List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增车辆失信 | 32 | * 新增车辆失信 |
| @@ -34,7 +34,7 @@ public interface TruckCreditMapper | @@ -34,7 +34,7 @@ public interface TruckCreditMapper | ||
| 34 | * @param truckCredit 车辆失信 | 34 | * @param truckCredit 车辆失信 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertTruckCredit(TruckCredit truckCredit); | 37 | + int insertTruckCredit(TruckCredit truckCredit); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改车辆失信 | 40 | * 修改车辆失信 |
| @@ -42,7 +42,7 @@ public interface TruckCreditMapper | @@ -42,7 +42,7 @@ public interface TruckCreditMapper | ||
| 42 | * @param truckCredit 车辆失信 | 42 | * @param truckCredit 车辆失信 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateTruckCredit(TruckCredit truckCredit); | 45 | + int updateTruckCredit(TruckCredit truckCredit); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 删除车辆失信 | 48 | * 删除车辆失信 |
| @@ -50,7 +50,7 @@ public interface TruckCreditMapper | @@ -50,7 +50,7 @@ public interface TruckCreditMapper | ||
| 50 | * @param id 车辆失信ID | 50 | * @param id 车辆失信ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteTruckCreditById(Long id); | 53 | + int deleteTruckCreditById(Long id); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 批量删除车辆失信 | 56 | * 批量删除车辆失信 |
| @@ -58,11 +58,11 @@ public interface TruckCreditMapper | @@ -58,11 +58,11 @@ public interface TruckCreditMapper | ||
| 58 | * @param ids 需要删除的数据ID | 58 | * @param ids 需要删除的数据ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteTruckCreditByIds(Long[] ids); | 61 | + int deleteTruckCreditByIds(Long[] ids); |
| 62 | 62 | ||
| 63 | - public List<String> getNames(TruckCredit truckCredit); | 63 | + List<String> getNames(TruckCredit truckCredit); |
| 64 | 64 | ||
| 65 | - public List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit); | 65 | + List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit); |
| 66 | 66 | ||
| 67 | public List<String> getCompanys(TruckCredit truckCredit); | 67 | public List<String> getCompanys(TruckCredit truckCredit); |
| 68 | } | 68 | } |
| 69 | \ No newline at end of file | 69 | \ No newline at end of file |
trash-workFlow/src/main/java/com/trash/business/service/ICompanyCreditService.java
| @@ -27,7 +27,7 @@ public interface ICompanyCreditService { | @@ -27,7 +27,7 @@ public interface ICompanyCreditService { | ||
| 27 | * | 27 | * |
| 28 | * @param companyCredit 企业失信 | 28 | * @param companyCredit 企业失信 |
| 29 | * @return 结果 | 29 | * @return 结果 |
| 30 | - * @throws Exception | 30 | + * @throws Exception |
| 31 | */ | 31 | */ |
| 32 | public int insertCompanyCredit(CompanyCredit companyCredit); | 32 | public int insertCompanyCredit(CompanyCredit companyCredit); |
| 33 | 33 | ||
| @@ -37,7 +37,7 @@ public interface ICompanyCreditService { | @@ -37,7 +37,7 @@ public interface ICompanyCreditService { | ||
| 37 | * @param companyCredit 企业失信 | 37 | * @param companyCredit 企业失信 |
| 38 | * @return 结果 | 38 | * @return 结果 |
| 39 | */ | 39 | */ |
| 40 | - public int updateCompanyCredit(CompanyCredit companyCredit) throws Exception; | 40 | + public int updateCompanyCredit(CompanyCredit companyCredit); |
| 41 | 41 | ||
| 42 | /** | 42 | /** |
| 43 | * 删除企业失信 | 43 | * 删除企业失信 |
| @@ -60,6 +60,6 @@ public interface ICompanyCreditService { | @@ -60,6 +60,6 @@ public interface ICompanyCreditService { | ||
| 60 | public List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit); | 60 | public List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit); |
| 61 | 61 | ||
| 62 | public List<String> getPlaces(CompanyCredit credit); | 62 | public List<String> getPlaces(CompanyCredit credit); |
| 63 | - | 63 | + |
| 64 | public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit); | 64 | public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit); |
| 65 | } | 65 | } |
trash-workFlow/src/main/java/com/trash/business/service/IConstructionCreditService.java
| @@ -18,7 +18,7 @@ public interface IConstructionCreditService | @@ -18,7 +18,7 @@ public interface IConstructionCreditService | ||
| 18 | * @param id 三查机制ID | 18 | * @param id 三查机制ID |
| 19 | * @return 三查机制 | 19 | * @return 三查机制 |
| 20 | */ | 20 | */ |
| 21 | - public ConstructionCredit selectConstructionCreditById(Long id); | 21 | + ConstructionCredit selectConstructionCreditById(Long id); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 查询三查机制列表 | 24 | * 查询三查机制列表 |
| @@ -26,7 +26,7 @@ public interface IConstructionCreditService | @@ -26,7 +26,7 @@ public interface IConstructionCreditService | ||
| 26 | * @param constructionCredit 三查机制 | 26 | * @param constructionCredit 三查机制 |
| 27 | * @return 三查机制集合 | 27 | * @return 三查机制集合 |
| 28 | */ | 28 | */ |
| 29 | - public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit); | 29 | + List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 新增三查机制 | 32 | * 新增三查机制 |
| @@ -34,7 +34,7 @@ public interface IConstructionCreditService | @@ -34,7 +34,7 @@ public interface IConstructionCreditService | ||
| 34 | * @param constructionCredit 三查机制 | 34 | * @param constructionCredit 三查机制 |
| 35 | * @return 结果 | 35 | * @return 结果 |
| 36 | */ | 36 | */ |
| 37 | - public int insertConstructionCredit(ConstructionCredit constructionCredit); | 37 | + int insertConstructionCredit(ConstructionCredit constructionCredit); |
| 38 | 38 | ||
| 39 | /** | 39 | /** |
| 40 | * 修改三查机制 | 40 | * 修改三查机制 |
| @@ -42,7 +42,7 @@ public interface IConstructionCreditService | @@ -42,7 +42,7 @@ public interface IConstructionCreditService | ||
| 42 | * @param constructionCredit 三查机制 | 42 | * @param constructionCredit 三查机制 |
| 43 | * @return 结果 | 43 | * @return 结果 |
| 44 | */ | 44 | */ |
| 45 | - public int updateConstructionCredit(ConstructionCredit constructionCredit); | 45 | + int updateConstructionCredit(ConstructionCredit constructionCredit); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * 批量删除三查机制 | 48 | * 批量删除三查机制 |
| @@ -50,7 +50,7 @@ public interface IConstructionCreditService | @@ -50,7 +50,7 @@ public interface IConstructionCreditService | ||
| 50 | * @param ids 需要删除的三查机制ID | 50 | * @param ids 需要删除的三查机制ID |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int deleteConstructionCreditByIds(Long[] ids); | 53 | + int deleteConstructionCreditByIds(Long[] ids); |
| 54 | 54 | ||
| 55 | /** | 55 | /** |
| 56 | * 删除三查机制信息 | 56 | * 删除三查机制信息 |
| @@ -58,11 +58,11 @@ public interface IConstructionCreditService | @@ -58,11 +58,11 @@ public interface IConstructionCreditService | ||
| 58 | * @param id 三查机制ID | 58 | * @param id 三查机制ID |
| 59 | * @return 结果 | 59 | * @return 结果 |
| 60 | */ | 60 | */ |
| 61 | - public int deleteConstructionCreditById(Long id); | 61 | + int deleteConstructionCreditById(Long id); |
| 62 | 62 | ||
| 63 | - public List<String> getNames(ConstructionCredit constructionCredit); | ||
| 64 | - public List<String> getTypes(ConstructionCredit constructionCredit); | ||
| 65 | - public List<String> getPlaces(ConstructionCredit constructionCredit); | 63 | + List<String> getNames(ConstructionCredit constructionCredit); |
| 64 | + List<String> getTypes(ConstructionCredit constructionCredit); | ||
| 65 | + List<String> getPlaces(ConstructionCredit constructionCredit); | ||
| 66 | 66 | ||
| 67 | - public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit); | 67 | + List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit); |
| 68 | } | 68 | } |
trash-workFlow/src/main/java/com/trash/business/service/IDriverCreditService.java
| @@ -11,7 +11,7 @@ public interface IDriverCreditService { | @@ -11,7 +11,7 @@ public interface IDriverCreditService { | ||
| 11 | * @param id 驾驶员失信ID | 11 | * @param id 驾驶员失信ID |
| 12 | * @return 驾驶员失信 | 12 | * @return 驾驶员失信 |
| 13 | */ | 13 | */ |
| 14 | - public DriverCredit selectDriverCreditById(Long id); | 14 | + DriverCredit selectDriverCreditById(Long id); |
| 15 | 15 | ||
| 16 | /** | 16 | /** |
| 17 | * 查询驾驶员失信列表 | 17 | * 查询驾驶员失信列表 |
| @@ -19,7 +19,7 @@ public interface IDriverCreditService { | @@ -19,7 +19,7 @@ public interface IDriverCreditService { | ||
| 19 | * @param driverCredit 驾驶员失信 | 19 | * @param driverCredit 驾驶员失信 |
| 20 | * @return 驾驶员失信集合 | 20 | * @return 驾驶员失信集合 |
| 21 | */ | 21 | */ |
| 22 | - public List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit); | 22 | + List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 新增驾驶员失信 | 25 | * 新增驾驶员失信 |
| @@ -27,7 +27,7 @@ public interface IDriverCreditService { | @@ -27,7 +27,7 @@ public interface IDriverCreditService { | ||
| 27 | * @param driverCredit 驾驶员失信 | 27 | * @param driverCredit 驾驶员失信 |
| 28 | * @return 结果 | 28 | * @return 结果 |
| 29 | */ | 29 | */ |
| 30 | - public int insertDriverCredit(DriverCredit driverCredit); | 30 | + int insertDriverCredit(DriverCredit driverCredit); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 修改驾驶员失信 | 33 | * 修改驾驶员失信 |
| @@ -35,7 +35,7 @@ public interface IDriverCreditService { | @@ -35,7 +35,7 @@ public interface IDriverCreditService { | ||
| 35 | * @param driverCredit 驾驶员失信 | 35 | * @param driverCredit 驾驶员失信 |
| 36 | * @return 结果 | 36 | * @return 结果 |
| 37 | */ | 37 | */ |
| 38 | - public int updateDriverCredit(DriverCredit driverCredit); | 38 | + int updateDriverCredit(DriverCredit driverCredit); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 删除驾驶员失信 | 41 | * 删除驾驶员失信 |
| @@ -43,7 +43,7 @@ public interface IDriverCreditService { | @@ -43,7 +43,7 @@ public interface IDriverCreditService { | ||
| 43 | * @param id 驾驶员失信ID | 43 | * @param id 驾驶员失信ID |
| 44 | * @return 结果 | 44 | * @return 结果 |
| 45 | */ | 45 | */ |
| 46 | - public int deleteDriverCreditById(Long id); | 46 | + int deleteDriverCreditById(Long id); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 批量删除驾驶员失信 | 49 | * 批量删除驾驶员失信 |
| @@ -51,9 +51,9 @@ public interface IDriverCreditService { | @@ -51,9 +51,9 @@ public interface IDriverCreditService { | ||
| 51 | * @param ids 需要删除的数据ID | 51 | * @param ids 需要删除的数据ID |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int deleteDriverCreditByIds(Long[] ids); | 54 | + int deleteDriverCreditByIds(Long[] ids); |
| 55 | 55 | ||
| 56 | - public List<String> getNames(DriverCredit driverCredit); | 56 | + List<String> getNames(DriverCredit driverCredit); |
| 57 | 57 | ||
| 58 | - public List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit); | 58 | + List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit); |
| 59 | } | 59 | } |
trash-workFlow/src/main/java/com/trash/business/service/IEarthsitesCreditService.java
| @@ -19,7 +19,7 @@ public interface IEarthsitesCreditService | @@ -19,7 +19,7 @@ public interface IEarthsitesCreditService | ||
| 19 | * @param id 消纳场失信ID | 19 | * @param id 消纳场失信ID |
| 20 | * @return 消纳场失信 | 20 | * @return 消纳场失信 |
| 21 | */ | 21 | */ |
| 22 | - public EarthsitesCredit selectEarthsitesCreditById(Long id); | 22 | + EarthsitesCredit selectEarthsitesCreditById(Long id); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 查询消纳场失信列表 | 25 | * 查询消纳场失信列表 |
| @@ -27,7 +27,7 @@ public interface IEarthsitesCreditService | @@ -27,7 +27,7 @@ public interface IEarthsitesCreditService | ||
| 27 | * @param earthsitesCredit 消纳场失信 | 27 | * @param earthsitesCredit 消纳场失信 |
| 28 | * @return 消纳场失信集合 | 28 | * @return 消纳场失信集合 |
| 29 | */ | 29 | */ |
| 30 | - public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit); | 30 | + List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 新增消纳场失信 | 33 | * 新增消纳场失信 |
| @@ -35,7 +35,7 @@ public interface IEarthsitesCreditService | @@ -35,7 +35,7 @@ public interface IEarthsitesCreditService | ||
| 35 | * @param earthsitesCredit 消纳场失信 | 35 | * @param earthsitesCredit 消纳场失信 |
| 36 | * @return 结果 | 36 | * @return 结果 |
| 37 | */ | 37 | */ |
| 38 | - public int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit); | 38 | + int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 修改消纳场失信 | 41 | * 修改消纳场失信 |
| @@ -43,7 +43,7 @@ public interface IEarthsitesCreditService | @@ -43,7 +43,7 @@ public interface IEarthsitesCreditService | ||
| 43 | * @param earthsitesCredit 消纳场失信 | 43 | * @param earthsitesCredit 消纳场失信 |
| 44 | * @return 结果 | 44 | * @return 结果 |
| 45 | */ | 45 | */ |
| 46 | - public int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit); | 46 | + int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit); |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * 批量删除消纳场失信 | 49 | * 批量删除消纳场失信 |
| @@ -51,7 +51,7 @@ public interface IEarthsitesCreditService | @@ -51,7 +51,7 @@ public interface IEarthsitesCreditService | ||
| 51 | * @param ids 需要删除的消纳场失信ID | 51 | * @param ids 需要删除的消纳场失信ID |
| 52 | * @return 结果 | 52 | * @return 结果 |
| 53 | */ | 53 | */ |
| 54 | - public int deleteEarthsitesCreditByIds(Long[] ids); | 54 | + int deleteEarthsitesCreditByIds(Long[] ids); |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * 删除消纳场失信信息 | 57 | * 删除消纳场失信信息 |
| @@ -59,11 +59,11 @@ public interface IEarthsitesCreditService | @@ -59,11 +59,11 @@ public interface IEarthsitesCreditService | ||
| 59 | * @param id 消纳场失信ID | 59 | * @param id 消纳场失信ID |
| 60 | * @return 结果 | 60 | * @return 结果 |
| 61 | */ | 61 | */ |
| 62 | - public int deleteEarthsitesCreditById(Long id); | 62 | + int deleteEarthsitesCreditById(Long id); |
| 63 | 63 | ||
| 64 | - public List<String> getNames(EarthsitesCredit earthsitesCredit); | 64 | + List<String> getNames(EarthsitesCredit earthsitesCredit); |
| 65 | public List<String> getTypes(EarthsitesCredit earthsitesCredit); | 65 | public List<String> getTypes(EarthsitesCredit earthsitesCredit); |
| 66 | public List<String> getPlaces(EarthsitesCredit earthsitesCredit); | 66 | public List<String> getPlaces(EarthsitesCredit earthsitesCredit); |
| 67 | 67 | ||
| 68 | - public List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit); | 68 | + List<EarthsitesCredit> selectEarthsitesCreditHistory(EarthsitesCredit earthsitesCredit); |
| 69 | } | 69 | } |
| 70 | \ No newline at end of file | 70 | \ No newline at end of file |
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
| @@ -21,7 +21,7 @@ public interface ISupervisionThreestepService | @@ -21,7 +21,7 @@ public interface ISupervisionThreestepService | ||
| 21 | * @param id 三查机制ID | 21 | * @param id 三查机制ID |
| 22 | * @return 三查机制 | 22 | * @return 三查机制 |
| 23 | */ | 23 | */ |
| 24 | - public SupervisionThreestep selectSupervisionThreestepById(Long id); | 24 | + SupervisionThreestep selectSupervisionThreestepById(Long id); |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * 查询三查机制列表 | 27 | * 查询三查机制列表 |
| @@ -29,7 +29,7 @@ public interface ISupervisionThreestepService | @@ -29,7 +29,7 @@ public interface ISupervisionThreestepService | ||
| 29 | * @param supervisionThreestep 三查机制 | 29 | * @param supervisionThreestep 三查机制 |
| 30 | * @return 三查机制集合 | 30 | * @return 三查机制集合 |
| 31 | */ | 31 | */ |
| 32 | - public List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep); | 32 | + List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep); |
| 33 | 33 | ||
| 34 | /** | 34 | /** |
| 35 | * 新增三查机制 | 35 | * 新增三查机制 |
| @@ -37,7 +37,7 @@ public interface ISupervisionThreestepService | @@ -37,7 +37,7 @@ public interface ISupervisionThreestepService | ||
| 37 | * @param supervisionThreestep 三查机制 | 37 | * @param supervisionThreestep 三查机制 |
| 38 | * @return 结果 | 38 | * @return 结果 |
| 39 | */ | 39 | */ |
| 40 | - public int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep); | 40 | + int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep); |
| 41 | 41 | ||
| 42 | /** | 42 | /** |
| 43 | * 修改三查机制 | 43 | * 修改三查机制 |
| @@ -45,7 +45,7 @@ public interface ISupervisionThreestepService | @@ -45,7 +45,7 @@ public interface ISupervisionThreestepService | ||
| 45 | * @param supervisionThreestep 三查机制 | 45 | * @param supervisionThreestep 三查机制 |
| 46 | * @return 结果 | 46 | * @return 结果 |
| 47 | */ | 47 | */ |
| 48 | - public int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep); | 48 | + int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep); |
| 49 | 49 | ||
| 50 | /** | 50 | /** |
| 51 | * 批量删除三查机制 | 51 | * 批量删除三查机制 |
| @@ -53,7 +53,7 @@ public interface ISupervisionThreestepService | @@ -53,7 +53,7 @@ public interface ISupervisionThreestepService | ||
| 53 | * @param ids 需要删除的三查机制ID | 53 | * @param ids 需要删除的三查机制ID |
| 54 | * @return 结果 | 54 | * @return 结果 |
| 55 | */ | 55 | */ |
| 56 | - public int deleteSupervisionThreestepByIds(Long[] ids); | 56 | + int deleteSupervisionThreestepByIds(Long[] ids); |
| 57 | 57 | ||
| 58 | /** | 58 | /** |
| 59 | * 删除三查机制信息 | 59 | * 删除三查机制信息 |
| @@ -61,9 +61,9 @@ public interface ISupervisionThreestepService | @@ -61,9 +61,9 @@ public interface ISupervisionThreestepService | ||
| 61 | * @param id 三查机制ID | 61 | * @param id 三查机制ID |
| 62 | * @return 结果 | 62 | * @return 结果 |
| 63 | */ | 63 | */ |
| 64 | - public int deleteSupervisionThreestepById(Long id); | 64 | + int deleteSupervisionThreestepById(Long id); |
| 65 | 65 | ||
| 66 | - public String upload(MultipartFile file); | 66 | + String upload(MultipartFile file); |
| 67 | 67 | ||
| 68 | public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep); | 68 | public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep); |
| 69 | 69 |
trash-workFlow/src/main/java/com/trash/business/service/ITruckCreditService.java
| @@ -12,7 +12,7 @@ public interface ITruckCreditService { | @@ -12,7 +12,7 @@ public interface ITruckCreditService { | ||
| 12 | * @param id 车辆失信ID | 12 | * @param id 车辆失信ID |
| 13 | * @return 车辆失信 | 13 | * @return 车辆失信 |
| 14 | */ | 14 | */ |
| 15 | - public TruckCredit selectTruckCreditById(Long id); | 15 | + TruckCredit selectTruckCreditById(Long id); |
| 16 | 16 | ||
| 17 | /** | 17 | /** |
| 18 | * 查询车辆失信列表 | 18 | * 查询车辆失信列表 |
| @@ -20,7 +20,7 @@ public interface ITruckCreditService { | @@ -20,7 +20,7 @@ public interface ITruckCreditService { | ||
| 20 | * @param truckCredit 车辆失信 | 20 | * @param truckCredit 车辆失信 |
| 21 | * @return 车辆失信集合 | 21 | * @return 车辆失信集合 |
| 22 | */ | 22 | */ |
| 23 | - public List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit); | 23 | + List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit); |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * 新增车辆失信 | 26 | * 新增车辆失信 |
| @@ -28,7 +28,7 @@ public interface ITruckCreditService { | @@ -28,7 +28,7 @@ public interface ITruckCreditService { | ||
| 28 | * @param truckCredit 车辆失信 | 28 | * @param truckCredit 车辆失信 |
| 29 | * @return 结果 | 29 | * @return 结果 |
| 30 | */ | 30 | */ |
| 31 | - public int insertTruckCredit(TruckCredit truckCredit); | 31 | + int insertTruckCredit(TruckCredit truckCredit); |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 修改车辆失信 | 34 | * 修改车辆失信 |
| @@ -36,7 +36,7 @@ public interface ITruckCreditService { | @@ -36,7 +36,7 @@ public interface ITruckCreditService { | ||
| 36 | * @param truckCredit 车辆失信 | 36 | * @param truckCredit 车辆失信 |
| 37 | * @return 结果 | 37 | * @return 结果 |
| 38 | */ | 38 | */ |
| 39 | - public int updateTruckCredit(TruckCredit truckCredit); | 39 | + int updateTruckCredit(TruckCredit truckCredit); |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 删除车辆失信 | 42 | * 删除车辆失信 |
| @@ -44,7 +44,7 @@ public interface ITruckCreditService { | @@ -44,7 +44,7 @@ public interface ITruckCreditService { | ||
| 44 | * @param id 车辆失信ID | 44 | * @param id 车辆失信ID |
| 45 | * @return 结果 | 45 | * @return 结果 |
| 46 | */ | 46 | */ |
| 47 | - public int deleteTruckCreditById(Long id); | 47 | + int deleteTruckCreditById(Long id); |
| 48 | 48 | ||
| 49 | /** | 49 | /** |
| 50 | * 批量删除车辆失信 | 50 | * 批量删除车辆失信 |
| @@ -52,11 +52,11 @@ public interface ITruckCreditService { | @@ -52,11 +52,11 @@ public interface ITruckCreditService { | ||
| 52 | * @param ids 需要删除的数据ID | 52 | * @param ids 需要删除的数据ID |
| 53 | * @return 结果 | 53 | * @return 结果 |
| 54 | */ | 54 | */ |
| 55 | - public int deleteTruckCreditByIds(Long[] ids); | 55 | + int deleteTruckCreditByIds(Long[] ids); |
| 56 | 56 | ||
| 57 | - public List<String> getNames(TruckCredit truckCredit); | 57 | + List<String> getNames(TruckCredit truckCredit); |
| 58 | 58 | ||
| 59 | - public List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit); | 59 | + List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit); |
| 60 | 60 | ||
| 61 | public List<String> getCompanys(TruckCredit credit); | 61 | public List<String> getCompanys(TruckCredit credit); |
| 62 | } | 62 | } |
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
0 → 100644
| 1 | +package com.trash.casefile.controller; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.ArrayList; | ||
| 5 | +import java.util.List; | ||
| 6 | + | ||
| 7 | +import com.alibaba.fastjson.JSON; | ||
| 8 | +import com.trash.casefile.domain.vo.ViolationWarningInformationVo; | ||
| 9 | +import com.trash.office.domain.LeaveApplication; | ||
| 10 | +import com.trash.office.domain.UploadFile; | ||
| 11 | +import com.trash.office.domain.vo.LeaveApplicationVo; | ||
| 12 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 13 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 14 | +import org.springframework.web.bind.annotation.*; | ||
| 15 | +import com.trash.common.annotation.Log; | ||
| 16 | +import com.trash.common.core.controller.BaseController; | ||
| 17 | +import com.trash.common.core.domain.AjaxResult; | ||
| 18 | +import com.trash.common.enums.BusinessType; | ||
| 19 | +import com.trash.casefile.domain.ViolationWarningInformation; | ||
| 20 | +import com.trash.casefile.service.IViolationWarningInformationService; | ||
| 21 | +import com.trash.common.utils.poi.ExcelUtil; | ||
| 22 | +import com.trash.common.core.page.TableDataInfo; | ||
| 23 | +import org.springframework.web.multipart.MultipartFile; | ||
| 24 | + | ||
| 25 | +/** | ||
| 26 | + * 违规预警信息Controller | ||
| 27 | + * | ||
| 28 | + * @author 2c | ||
| 29 | + * @date 2023-05-09 | ||
| 30 | + */ | ||
| 31 | +@RestController | ||
| 32 | +@RequestMapping("/casefile/violationWarningInformation") | ||
| 33 | +public class ViolationWarningInformationController extends BaseController | ||
| 34 | +{ | ||
| 35 | + @Autowired | ||
| 36 | + private IViolationWarningInformationService violationWarningInformationService; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 查询违规预警信息列表 | ||
| 40 | + */ | ||
| 41 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:list')") | ||
| 42 | + @GetMapping("/list") | ||
| 43 | + public TableDataInfo list(ViolationWarningInformation violationWarningInformation) | ||
| 44 | + { | ||
| 45 | + startPage(); | ||
| 46 | + List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation); | ||
| 47 | + return getDataTable(list); | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 导出违规预警信息列表 | ||
| 52 | + */ | ||
| 53 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:export')") | ||
| 54 | + @Log(title = "违规预警信息", businessType = BusinessType.EXPORT) | ||
| 55 | + @GetMapping("/export") | ||
| 56 | + public AjaxResult export(ViolationWarningInformation violationWarningInformation) | ||
| 57 | + { | ||
| 58 | + List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation); | ||
| 59 | + ExcelUtil<ViolationWarningInformation> util = new ExcelUtil<ViolationWarningInformation>(ViolationWarningInformation.class); | ||
| 60 | + return util.exportExcel(list, "violationWarningInformation"); | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + /** | ||
| 64 | + * 获取违规预警信息详细信息 | ||
| 65 | + */ | ||
| 66 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:query')") | ||
| 67 | + @GetMapping(value = "/{id}") | ||
| 68 | + public AjaxResult getInfo(@PathVariable("id") Long id) | ||
| 69 | + { | ||
| 70 | + return AjaxResult.success(violationWarningInformationService.selectViolationWarningInformationById(id)); | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + /** | ||
| 74 | + * 新增违规预警信息 | ||
| 75 | + */ | ||
| 76 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:add')") | ||
| 77 | + @Log(title = "违规预警信息", businessType = BusinessType.INSERT) | ||
| 78 | + @PostMapping | ||
| 79 | + public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationWarningInformation violationWarningInformation) throws IOException { | ||
| 80 | + return toAjax(violationWarningInformationService.insertViolationWarningInformation(files,violationWarningInformation)); | ||
| 81 | + } | ||
| 82 | + | ||
| 83 | + /** | ||
| 84 | + * 修改违规预警信息 | ||
| 85 | + */ | ||
| 86 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:edit')") | ||
| 87 | + @Log(title = "违规预警信息", businessType = BusinessType.UPDATE) | ||
| 88 | + @PutMapping | ||
| 89 | + public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files, String violationWarningInformation, String[] uploadFilesList) throws IOException { | ||
| 90 | + ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo(); | ||
| 91 | + violationWarningInformationVo.setViolationWarningInformation(JSON.parseObject(violationWarningInformation, ViolationWarningInformation.class)); | ||
| 92 | + List<UploadFile> uploadFileList = new ArrayList<>(); | ||
| 93 | + for (String uploadFile : uploadFilesList) { | ||
| 94 | + UploadFile uploadFile1 = JSON.parseObject(uploadFile,UploadFile.class); | ||
| 95 | + if(uploadFile1!=null){ | ||
| 96 | + if(uploadFile1.getId()!=null){ | ||
| 97 | + uploadFileList.add(uploadFile1); | ||
| 98 | + } | ||
| 99 | + } | ||
| 100 | + } | ||
| 101 | + violationWarningInformationVo.setUploadFiles(uploadFileList); | ||
| 102 | + return toAjax(violationWarningInformationService.updateViolationWarningInformation(files,violationWarningInformationVo)); | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + /** | ||
| 106 | + * 删除违规预警信息 | ||
| 107 | + */ | ||
| 108 | + @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:remove')") | ||
| 109 | + @Log(title = "违规预警信息", businessType = BusinessType.DELETE) | ||
| 110 | + @DeleteMapping("/{ids}") | ||
| 111 | + public AjaxResult remove(@PathVariable Long[] ids) | ||
| 112 | + { | ||
| 113 | + return toAjax(violationWarningInformationService.deleteViolationWarningInformationByIds(ids)); | ||
| 114 | + } | ||
| 115 | +} |
trash-workFlow/src/main/java/com/trash/casefile/domain/ReplyApprovalProcess.java
0 → 100644
| 1 | +package com.trash.casefile.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 5 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 7 | +import com.trash.common.annotation.Excel; | ||
| 8 | +import com.trash.common.core.domain.BaseEntity; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 回复审批流程对象 reply_approval_process | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-10 | ||
| 15 | + */ | ||
| 16 | +public class ReplyApprovalProcess extends BaseEntity | ||
| 17 | +{ | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** $column.columnComment */ | ||
| 21 | + private Long id; | ||
| 22 | + | ||
| 23 | + /** 表名 */ | ||
| 24 | + @Excel(name = "表名") | ||
| 25 | + private String tableName; | ||
| 26 | + | ||
| 27 | + /** 表id */ | ||
| 28 | + @Excel(name = "表id") | ||
| 29 | + private String tableId; | ||
| 30 | + | ||
| 31 | + /** 流程实例id */ | ||
| 32 | + @Excel(name = "流程实例id") | ||
| 33 | + private String instanceId; | ||
| 34 | + | ||
| 35 | + /** 回复内容 */ | ||
| 36 | + @Excel(name = "回复内容") | ||
| 37 | + private String reply; | ||
| 38 | + | ||
| 39 | + /** 回复时间 */ | ||
| 40 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 41 | + @Excel(name = "回复时间", width = 60, dateFormat = "yyyy-MM-dd HH:mm:ss") | ||
| 42 | + private Date replyTime; | ||
| 43 | + | ||
| 44 | + /** 回复图片 */ | ||
| 45 | + @Excel(name = "回复图片") | ||
| 46 | + private String replyImg; | ||
| 47 | + | ||
| 48 | + /** 回复人 */ | ||
| 49 | + @Excel(name = "回复人") | ||
| 50 | + private String replyPeople; | ||
| 51 | + | ||
| 52 | + public void setId(Long id) | ||
| 53 | + { | ||
| 54 | + this.id = id; | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + public Long getId() | ||
| 58 | + { | ||
| 59 | + return id; | ||
| 60 | + } | ||
| 61 | + public void setTableName(String tableName) | ||
| 62 | + { | ||
| 63 | + this.tableName = tableName; | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + public String getTableName() | ||
| 67 | + { | ||
| 68 | + return tableName; | ||
| 69 | + } | ||
| 70 | + public void setTableId(String tableId) | ||
| 71 | + { | ||
| 72 | + this.tableId = tableId; | ||
| 73 | + } | ||
| 74 | + | ||
| 75 | + public String getTableId() | ||
| 76 | + { | ||
| 77 | + return tableId; | ||
| 78 | + } | ||
| 79 | + public void setInstanceId(String instanceId) | ||
| 80 | + { | ||
| 81 | + this.instanceId = instanceId; | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + public String getInstanceId() | ||
| 85 | + { | ||
| 86 | + return instanceId; | ||
| 87 | + } | ||
| 88 | + public void setReply(String reply) | ||
| 89 | + { | ||
| 90 | + this.reply = reply; | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + public String getReply() | ||
| 94 | + { | ||
| 95 | + return reply; | ||
| 96 | + } | ||
| 97 | + public void setReplyTime(Date replyTime) | ||
| 98 | + { | ||
| 99 | + this.replyTime = replyTime; | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + public Date getReplyTime() | ||
| 103 | + { | ||
| 104 | + return replyTime; | ||
| 105 | + } | ||
| 106 | + public void setReplyImg(String replyImg) | ||
| 107 | + { | ||
| 108 | + this.replyImg = replyImg; | ||
| 109 | + } | ||
| 110 | + | ||
| 111 | + public String getReplyImg() | ||
| 112 | + { | ||
| 113 | + return replyImg; | ||
| 114 | + } | ||
| 115 | + public void setReplyPeople(String replyPeople) | ||
| 116 | + { | ||
| 117 | + this.replyPeople = replyPeople; | ||
| 118 | + } | ||
| 119 | + | ||
| 120 | + public String getReplyPeople() | ||
| 121 | + { | ||
| 122 | + return replyPeople; | ||
| 123 | + } | ||
| 124 | + | ||
| 125 | + @Override | ||
| 126 | + public String toString() { | ||
| 127 | + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) | ||
| 128 | + .append("id", getId()) | ||
| 129 | + .append("tableName", getTableName()) | ||
| 130 | + .append("tableId", getTableId()) | ||
| 131 | + .append("instanceId", getInstanceId()) | ||
| 132 | + .append("reply", getReply()) | ||
| 133 | + .append("replyTime", getReplyTime()) | ||
| 134 | + .append("replyImg", getReplyImg()) | ||
| 135 | + .append("replyPeople", getReplyPeople()) | ||
| 136 | + .toString(); | ||
| 137 | + } | ||
| 138 | +} |
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
0 → 100644
| 1 | +package com.trash.casefile.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | + | ||
| 5 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 7 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 8 | +import com.trash.common.annotation.Excel; | ||
| 9 | +import com.trash.common.core.domain.BaseEntity; | ||
| 10 | + | ||
| 11 | +/** | ||
| 12 | + * 违规预警信息对象 casefile_violation_warning_information | ||
| 13 | + * | ||
| 14 | + * @author 2c | ||
| 15 | + * @date 2023-05-09 | ||
| 16 | + */ | ||
| 17 | +public class ViolationWarningInformation extends BaseEntity { | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * $column.columnComment | ||
| 22 | + */ | ||
| 23 | + private Long id; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 案卷编号 | ||
| 27 | + */ | ||
| 28 | + @Excel(name = "案卷编号") | ||
| 29 | + private String number; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 违规对象类型 | ||
| 33 | + */ | ||
| 34 | + @Excel(name = "违规对象类型") | ||
| 35 | + private String violationObjectType; | ||
| 36 | + | ||
| 37 | + /** | ||
| 38 | + * 所属区域 | ||
| 39 | + */ | ||
| 40 | + @Excel(name = "所属区域") | ||
| 41 | + private String owningRegion; | ||
| 42 | + | ||
| 43 | + /** | ||
| 44 | + * 违规类型 | ||
| 45 | + */ | ||
| 46 | + @Excel(name = "违规类型") | ||
| 47 | + private String violationType; | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 违规等级 | ||
| 51 | + */ | ||
| 52 | + @Excel(name = "违规等级") | ||
| 53 | + private String violationGrade; | ||
| 54 | + | ||
| 55 | + /** | ||
| 56 | + * 项目名称 | ||
| 57 | + */ | ||
| 58 | + @Excel(name = "项目名称") | ||
| 59 | + private String projectName; | ||
| 60 | + | ||
| 61 | + /** | ||
| 62 | + * 企业名称 | ||
| 63 | + */ | ||
| 64 | + @Excel(name = "企业名称") | ||
| 65 | + private String companyName; | ||
| 66 | + | ||
| 67 | + /** | ||
| 68 | + * 违规描述 | ||
| 69 | + */ | ||
| 70 | + @Excel(name = "违规描述") | ||
| 71 | + private String describe; | ||
| 72 | + | ||
| 73 | + /** | ||
| 74 | + * 推送对象 | ||
| 75 | + */ | ||
| 76 | + @Excel(name = "推送对象") | ||
| 77 | + private String sendObject; | ||
| 78 | + | ||
| 79 | + /** | ||
| 80 | + * 审批状态 | ||
| 81 | + */ | ||
| 82 | + private Integer status; | ||
| 83 | + | ||
| 84 | + /** | ||
| 85 | + * 接收人 | ||
| 86 | + */ | ||
| 87 | + @Excel(name = "接收人") | ||
| 88 | + private String receive; | ||
| 89 | + | ||
| 90 | + /** | ||
| 91 | + * 接收状态 | ||
| 92 | + */ | ||
| 93 | + @Excel(name = "接收状态") | ||
| 94 | + private Integer receiveStatus; | ||
| 95 | + | ||
| 96 | + /** | ||
| 97 | + * 阅览人 | ||
| 98 | + */ | ||
| 99 | + @Excel(name = "阅览人") | ||
| 100 | + private String readBy; | ||
| 101 | + | ||
| 102 | + /** | ||
| 103 | + * 阅览时间 | ||
| 104 | + */ | ||
| 105 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 106 | + @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | ||
| 107 | + private Date readTime; | ||
| 108 | + | ||
| 109 | + /** | ||
| 110 | + * 回复1 | ||
| 111 | + */ | ||
| 112 | + private String replyOne; | ||
| 113 | + | ||
| 114 | + /** | ||
| 115 | + * 回复2 | ||
| 116 | + */ | ||
| 117 | + private String replyTwo; | ||
| 118 | + | ||
| 119 | + /** | ||
| 120 | + * 回复3 | ||
| 121 | + */ | ||
| 122 | + private String replyThree; | ||
| 123 | + | ||
| 124 | + /** | ||
| 125 | + * 回复4 | ||
| 126 | + */ | ||
| 127 | + private String replyFour; | ||
| 128 | + | ||
| 129 | + /** | ||
| 130 | + * 回复时间1 | ||
| 131 | + */ | ||
| 132 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 133 | + private Date replyTimeOne; | ||
| 134 | + | ||
| 135 | + /** | ||
| 136 | + * 回复时间2 | ||
| 137 | + */ | ||
| 138 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 139 | + private Date replyTimeTwo; | ||
| 140 | + | ||
| 141 | + /** | ||
| 142 | + * 回复时间3 | ||
| 143 | + */ | ||
| 144 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 145 | + private Date replyTimeThree; | ||
| 146 | + | ||
| 147 | + /** | ||
| 148 | + * 回复时间4 | ||
| 149 | + */ | ||
| 150 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 151 | + private Date replyTimeFour; | ||
| 152 | + | ||
| 153 | + /** | ||
| 154 | + * 回复图片1 | ||
| 155 | + */ | ||
| 156 | + private String replyImgOne; | ||
| 157 | + | ||
| 158 | + /** | ||
| 159 | + * 回复图片1 | ||
| 160 | + */ | ||
| 161 | + private String replyImgTwo; | ||
| 162 | + | ||
| 163 | + /** | ||
| 164 | + * 回复图片1 | ||
| 165 | + */ | ||
| 166 | + private String replyImgThree; | ||
| 167 | + | ||
| 168 | + /** | ||
| 169 | + * 回复图片1 | ||
| 170 | + */ | ||
| 171 | + private String replyImgFour; | ||
| 172 | + | ||
| 173 | + public void setId(Long id) { | ||
| 174 | + this.id = id; | ||
| 175 | + } | ||
| 176 | + | ||
| 177 | + public Long getId() { | ||
| 178 | + return id; | ||
| 179 | + } | ||
| 180 | + | ||
| 181 | + public void setNumber(String number) { | ||
| 182 | + this.number = number; | ||
| 183 | + } | ||
| 184 | + | ||
| 185 | + public String getNumber() { | ||
| 186 | + return number; | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + public void setViolationObjectType(String violationObjectType) { | ||
| 190 | + this.violationObjectType = violationObjectType; | ||
| 191 | + } | ||
| 192 | + | ||
| 193 | + public String getViolationObjectType() { | ||
| 194 | + return violationObjectType; | ||
| 195 | + } | ||
| 196 | + | ||
| 197 | + public void setOwningRegion(String owningRegion) { | ||
| 198 | + this.owningRegion = owningRegion; | ||
| 199 | + } | ||
| 200 | + | ||
| 201 | + public String getOwningRegion() { | ||
| 202 | + return owningRegion; | ||
| 203 | + } | ||
| 204 | + | ||
| 205 | + public void setViolationType(String violationType) { | ||
| 206 | + this.violationType = violationType; | ||
| 207 | + } | ||
| 208 | + | ||
| 209 | + public String getViolationType() { | ||
| 210 | + return violationType; | ||
| 211 | + } | ||
| 212 | + | ||
| 213 | + public void setViolationGrade(String violationGrade) { | ||
| 214 | + this.violationGrade = violationGrade; | ||
| 215 | + } | ||
| 216 | + | ||
| 217 | + public String getViolationGrade() { | ||
| 218 | + return violationGrade; | ||
| 219 | + } | ||
| 220 | + | ||
| 221 | + public void setProjectName(String projectName) { | ||
| 222 | + this.projectName = projectName; | ||
| 223 | + } | ||
| 224 | + | ||
| 225 | + public String getProjectName() { | ||
| 226 | + return projectName; | ||
| 227 | + } | ||
| 228 | + | ||
| 229 | + public void setCompanyName(String companyName) { | ||
| 230 | + this.companyName = companyName; | ||
| 231 | + } | ||
| 232 | + | ||
| 233 | + public String getCompanyName() { | ||
| 234 | + return companyName; | ||
| 235 | + } | ||
| 236 | + | ||
| 237 | + public void setDescribe(String describe) { | ||
| 238 | + this.describe = describe; | ||
| 239 | + } | ||
| 240 | + | ||
| 241 | + public String getDescribe() { | ||
| 242 | + return describe; | ||
| 243 | + } | ||
| 244 | + | ||
| 245 | + public void setSendObject(String sendObject) { | ||
| 246 | + this.sendObject = sendObject; | ||
| 247 | + } | ||
| 248 | + | ||
| 249 | + public String getSendObject() { | ||
| 250 | + return sendObject; | ||
| 251 | + } | ||
| 252 | + | ||
| 253 | + public void setStatus(Integer status) { | ||
| 254 | + this.status = status; | ||
| 255 | + } | ||
| 256 | + | ||
| 257 | + public Integer getStatus() { | ||
| 258 | + return status; | ||
| 259 | + } | ||
| 260 | + | ||
| 261 | + public void setReceive(String receive) { | ||
| 262 | + this.receive = receive; | ||
| 263 | + } | ||
| 264 | + | ||
| 265 | + public String getReceive() { | ||
| 266 | + return receive; | ||
| 267 | + } | ||
| 268 | + | ||
| 269 | + public void setReceiveStatus(Integer receiveStatus) { | ||
| 270 | + this.receiveStatus = receiveStatus; | ||
| 271 | + } | ||
| 272 | + | ||
| 273 | + public Integer getReceiveStatus() { | ||
| 274 | + return receiveStatus; | ||
| 275 | + } | ||
| 276 | + | ||
| 277 | + public void setReadBy(String readBy) { | ||
| 278 | + this.readBy = readBy; | ||
| 279 | + } | ||
| 280 | + | ||
| 281 | + public String getReadBy() { | ||
| 282 | + return readBy; | ||
| 283 | + } | ||
| 284 | + | ||
| 285 | + public void setReadTime(Date readTime) { | ||
| 286 | + this.readTime = readTime; | ||
| 287 | + } | ||
| 288 | + | ||
| 289 | + public Date getReadTime() { | ||
| 290 | + return readTime; | ||
| 291 | + } | ||
| 292 | + | ||
| 293 | + public void setReplyOne(String replyOne) { | ||
| 294 | + this.replyOne = replyOne; | ||
| 295 | + } | ||
| 296 | + | ||
| 297 | + public String getReplyOne() { | ||
| 298 | + return replyOne; | ||
| 299 | + } | ||
| 300 | + | ||
| 301 | + public void setReplyTwo(String replyTwo) { | ||
| 302 | + this.replyTwo = replyTwo; | ||
| 303 | + } | ||
| 304 | + | ||
| 305 | + public String getReplyTwo() { | ||
| 306 | + return replyTwo; | ||
| 307 | + } | ||
| 308 | + | ||
| 309 | + public void setReplyThree(String replyThree) { | ||
| 310 | + this.replyThree = replyThree; | ||
| 311 | + } | ||
| 312 | + | ||
| 313 | + public String getReplyThree() { | ||
| 314 | + return replyThree; | ||
| 315 | + } | ||
| 316 | + | ||
| 317 | + public String getReplyFour() { | ||
| 318 | + return replyFour; | ||
| 319 | + } | ||
| 320 | + | ||
| 321 | + public void setReplyFour(String replyFour) { | ||
| 322 | + this.replyFour = replyFour; | ||
| 323 | + } | ||
| 324 | + | ||
| 325 | + public Date getReplyTimeOne() { | ||
| 326 | + return replyTimeOne; | ||
| 327 | + } | ||
| 328 | + | ||
| 329 | + public void setReplyTimeOne(Date replyTimeOne) { | ||
| 330 | + this.replyTimeOne = replyTimeOne; | ||
| 331 | + } | ||
| 332 | + | ||
| 333 | + public Date getReplyTimeTwo() { | ||
| 334 | + return replyTimeTwo; | ||
| 335 | + } | ||
| 336 | + | ||
| 337 | + public void setReplyTimeTwo(Date replyTimeTwo) { | ||
| 338 | + this.replyTimeTwo = replyTimeTwo; | ||
| 339 | + } | ||
| 340 | + | ||
| 341 | + public Date getReplyTimeThree() { | ||
| 342 | + return replyTimeThree; | ||
| 343 | + } | ||
| 344 | + | ||
| 345 | + public void setReplyTimeThree(Date replyTimeThree) { | ||
| 346 | + this.replyTimeThree = replyTimeThree; | ||
| 347 | + } | ||
| 348 | + | ||
| 349 | + public Date getReplyTimeFour() { | ||
| 350 | + return replyTimeFour; | ||
| 351 | + } | ||
| 352 | + | ||
| 353 | + public void setReplyTimeFour(Date replyTimeFour) { | ||
| 354 | + this.replyTimeFour = replyTimeFour; | ||
| 355 | + } | ||
| 356 | + | ||
| 357 | + public String getReplyImgOne() { | ||
| 358 | + return replyImgOne; | ||
| 359 | + } | ||
| 360 | + | ||
| 361 | + public void setReplyImgOne(String replyImgOne) { | ||
| 362 | + this.replyImgOne = replyImgOne; | ||
| 363 | + } | ||
| 364 | + | ||
| 365 | + public String getReplyImgTwo() { | ||
| 366 | + return replyImgTwo; | ||
| 367 | + } | ||
| 368 | + | ||
| 369 | + public void setReplyImgTwo(String replyImgTwo) { | ||
| 370 | + this.replyImgTwo = replyImgTwo; | ||
| 371 | + } | ||
| 372 | + | ||
| 373 | + public String getReplyImgThree() { | ||
| 374 | + return replyImgThree; | ||
| 375 | + } | ||
| 376 | + | ||
| 377 | + public void setReplyImgThree(String replyImgThree) { | ||
| 378 | + this.replyImgThree = replyImgThree; | ||
| 379 | + } | ||
| 380 | + | ||
| 381 | + public String getReplyImgFour() { | ||
| 382 | + return replyImgFour; | ||
| 383 | + } | ||
| 384 | + | ||
| 385 | + public void setReplyImgFour(String replyImgFour) { | ||
| 386 | + this.replyImgFour = replyImgFour; | ||
| 387 | + } | ||
| 388 | + | ||
| 389 | + @Override | ||
| 390 | + public String toString() { | ||
| 391 | + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) | ||
| 392 | + .append("id", getId()) | ||
| 393 | + .append("number", getNumber()) | ||
| 394 | + .append("violationObjectType", getViolationObjectType()) | ||
| 395 | + .append("owningRegion", getOwningRegion()) | ||
| 396 | + .append("violationType", getViolationType()) | ||
| 397 | + .append("violationGrade", getViolationGrade()) | ||
| 398 | + .append("projectName", getProjectName()) | ||
| 399 | + .append("companyName", getCompanyName()) | ||
| 400 | + .append("describe", getDescribe()) | ||
| 401 | + .append("sendObject", getSendObject()) | ||
| 402 | + .append("createTime", getCreateTime()) | ||
| 403 | + .append("createBy", getCreateBy()) | ||
| 404 | + .append("updateTime", getUpdateTime()) | ||
| 405 | + .append("updateBy", getUpdateBy()) | ||
| 406 | + .append("status", getStatus()) | ||
| 407 | + .append("receive", getReceive()) | ||
| 408 | + .append("receiveStatus", getReceiveStatus()) | ||
| 409 | + .append("readBy", getReadBy()) | ||
| 410 | + .append("readTime", getReadTime()) | ||
| 411 | + .append("replyOne", getReplyOne()) | ||
| 412 | + .append("replyTwo", getReplyTwo()) | ||
| 413 | + .append("replyThree", getReplyThree()) | ||
| 414 | + .append("replyFour", getReplyFour()) | ||
| 415 | + .append("replyTimeOne", getReplyTimeOne()) | ||
| 416 | + .append("replyTimeTwo", getReplyTimeTwo()) | ||
| 417 | + .append("replyTimeThree", getReplyTimeThree()) | ||
| 418 | + .append("replyTimeFour", getReplyTimeFour()) | ||
| 419 | + .append("replyImgOne", getReplyImgOne()) | ||
| 420 | + .append("replyImgTwo", getReplyImgTwo()) | ||
| 421 | + .append("replyImgThree", getReplyImgThree()) | ||
| 422 | + .append("replyImgFour", getReplyImgFour()) | ||
| 423 | + .toString(); | ||
| 424 | + } | ||
| 425 | +} |
trash-workFlow/src/main/java/com/trash/casefile/domain/vo/ViolationWarningInformationVo.java
0 → 100644
| 1 | +package com.trash.casefile.domain.vo; | ||
| 2 | + | ||
| 3 | +import com.trash.casefile.domain.ViolationWarningInformation; | ||
| 4 | +import com.trash.office.domain.UploadFile; | ||
| 5 | + | ||
| 6 | +import java.util.List; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * 违规预警信息Vo | ||
| 10 | + * | ||
| 11 | + * @author 2c | ||
| 12 | + */ | ||
| 13 | +public class ViolationWarningInformationVo { | ||
| 14 | + private ViolationWarningInformation violationWarningInformation; | ||
| 15 | + | ||
| 16 | + private List<UploadFile> uploadFiles; | ||
| 17 | + | ||
| 18 | + public List<UploadFile> getUploadFiles() { | ||
| 19 | + return uploadFiles; | ||
| 20 | + } | ||
| 21 | + | ||
| 22 | + public void setUploadFiles(List<UploadFile> uploadFiles) { | ||
| 23 | + this.uploadFiles = uploadFiles; | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | + public ViolationWarningInformation getViolationWarningInformation() { | ||
| 27 | + return violationWarningInformation; | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + public void setViolationWarningInformation(ViolationWarningInformation violationWarningInformation) { | ||
| 31 | + this.violationWarningInformation = violationWarningInformation; | ||
| 32 | + } | ||
| 33 | +} |
trash-workFlow/src/main/java/com/trash/casefile/mapper/ReplyApprovalProcessMapper.java
0 → 100644
| 1 | +package com.trash.casefile.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import com.trash.casefile.domain.ReplyApprovalProcess; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * 回复审批流程Mapper接口 | ||
| 8 | + * | ||
| 9 | + * @author 2c | ||
| 10 | + * @date 2023-05-10 | ||
| 11 | + */ | ||
| 12 | +public interface ReplyApprovalProcessMapper | ||
| 13 | +{ | ||
| 14 | + /** | ||
| 15 | + * 查询回复审批流程 | ||
| 16 | + * | ||
| 17 | + * @param id 回复审批流程ID | ||
| 18 | + * @return 回复审批流程 | ||
| 19 | + */ | ||
| 20 | + ReplyApprovalProcess selectReplyApprovalProcessById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询回复审批流程列表 | ||
| 24 | + * | ||
| 25 | + * @param replyApprovalProcess 回复审批流程 | ||
| 26 | + * @return 回复审批流程集合 | ||
| 27 | + */ | ||
| 28 | + List<ReplyApprovalProcess> selectReplyApprovalProcessList(ReplyApprovalProcess replyApprovalProcess); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增回复审批流程 | ||
| 32 | + * | ||
| 33 | + * @param replyApprovalProcess 回复审批流程 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertReplyApprovalProcess(ReplyApprovalProcess replyApprovalProcess); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改回复审批流程 | ||
| 40 | + * | ||
| 41 | + * @param replyApprovalProcess 回复审批流程 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateReplyApprovalProcess(ReplyApprovalProcess replyApprovalProcess); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除回复审批流程 | ||
| 48 | + * | ||
| 49 | + * @param id 回复审批流程ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteReplyApprovalProcessById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除回复审批流程 | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteReplyApprovalProcessByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/casefile/mapper/ViolationWarningInformationMapper.java
0 → 100644
| 1 | +package com.trash.casefile.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import com.trash.casefile.domain.ViolationWarningInformation; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * 违规预警信息Mapper接口 | ||
| 8 | + * | ||
| 9 | + * @author 2c | ||
| 10 | + * @date 2023-05-09 | ||
| 11 | + */ | ||
| 12 | +public interface ViolationWarningInformationMapper | ||
| 13 | +{ | ||
| 14 | + /** | ||
| 15 | + * 查询违规预警信息 | ||
| 16 | + * | ||
| 17 | + * @param id 违规预警信息ID | ||
| 18 | + * @return 违规预警信息 | ||
| 19 | + */ | ||
| 20 | + ViolationWarningInformation selectViolationWarningInformationById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询违规预警信息列表 | ||
| 24 | + * | ||
| 25 | + * @param violationWarningInformation 违规预警信息 | ||
| 26 | + * @return 违规预警信息集合 | ||
| 27 | + */ | ||
| 28 | + List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增违规预警信息 | ||
| 32 | + * | ||
| 33 | + * @param violationWarningInformation 违规预警信息 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertViolationWarningInformation(ViolationWarningInformation violationWarningInformation); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改违规预警信息 | ||
| 40 | + * | ||
| 41 | + * @param violationWarningInformation 违规预警信息 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateViolationWarningInformation(ViolationWarningInformation violationWarningInformation); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除违规预警信息 | ||
| 48 | + * | ||
| 49 | + * @param id 违规预警信息ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteViolationWarningInformationById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除违规预警信息 | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteViolationWarningInformationByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/casefile/service/IViolationWarningInformationService.java
0 → 100644
| 1 | +package com.trash.casefile.service; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | + | ||
| 6 | +import com.trash.casefile.domain.ViolationWarningInformation; | ||
| 7 | +import com.trash.casefile.domain.vo.ViolationWarningInformationVo; | ||
| 8 | +import org.springframework.web.multipart.MultipartFile; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 违规预警信息Service接口 | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-09 | ||
| 15 | + */ | ||
| 16 | +public interface IViolationWarningInformationService { | ||
| 17 | + /** | ||
| 18 | + * 查询违规预警信息 | ||
| 19 | + * | ||
| 20 | + * @param id 违规预警信息ID | ||
| 21 | + * @return 违规预警信息 | ||
| 22 | + */ | ||
| 23 | + ViolationWarningInformationVo selectViolationWarningInformationById(Long id); | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 查询违规预警信息列表 | ||
| 27 | + * | ||
| 28 | + * @param violationWarningInformation 违规预警信息 | ||
| 29 | + * @return 违规预警信息集合 | ||
| 30 | + */ | ||
| 31 | + List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation); | ||
| 32 | + | ||
| 33 | + /** | ||
| 34 | + * 新增违规预警信息 | ||
| 35 | + * | ||
| 36 | + * @param violationWarningInformation 违规预警信息 | ||
| 37 | + * @return 结果 | ||
| 38 | + */ | ||
| 39 | + int insertViolationWarningInformation(MultipartFile[] files, ViolationWarningInformation violationWarningInformation) throws IOException; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 修改违规预警信息 | ||
| 43 | + * | ||
| 44 | + * @param violationWarningInformation 违规预警信息 | ||
| 45 | + * @return 结果 | ||
| 46 | + */ | ||
| 47 | + int updateViolationWarningInformation(MultipartFile[] files,ViolationWarningInformationVo violationWarningInformationVo) throws IOException; | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 批量删除违规预警信息 | ||
| 51 | + * | ||
| 52 | + * @param ids 需要删除的违规预警信息ID | ||
| 53 | + * @return 结果 | ||
| 54 | + */ | ||
| 55 | + int deleteViolationWarningInformationByIds(Long[] ids); | ||
| 56 | + | ||
| 57 | + /** | ||
| 58 | + * 删除违规预警信息信息 | ||
| 59 | + * | ||
| 60 | + * @param id 违规预警信息ID | ||
| 61 | + * @return 结果 | ||
| 62 | + */ | ||
| 63 | + int deleteViolationWarningInformationById(Long id); | ||
| 64 | +} |
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
0 → 100644
| 1 | +package com.trash.casefile.service.impl; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import java.util.stream.Collectors; | ||
| 6 | + | ||
| 7 | +import com.trash.casefile.domain.vo.ViolationWarningInformationVo; | ||
| 8 | +import com.trash.common.utils.DateUtils; | ||
| 9 | +import com.trash.common.utils.SecurityUtils; | ||
| 10 | +import com.trash.common.utils.file.FileUploadUtils; | ||
| 11 | +import com.trash.office.domain.LeaveApplication; | ||
| 12 | +import com.trash.office.domain.UploadFile; | ||
| 13 | +import com.trash.office.domain.vo.LeaveApplicationVo; | ||
| 14 | +import com.trash.office.mapper.UploadFileMapper; | ||
| 15 | +import com.trash.workflow.domain.Workflow; | ||
| 16 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 17 | +import org.springframework.stereotype.Service; | ||
| 18 | +import com.trash.casefile.mapper.ViolationWarningInformationMapper; | ||
| 19 | +import com.trash.casefile.domain.ViolationWarningInformation; | ||
| 20 | +import com.trash.casefile.service.IViolationWarningInformationService; | ||
| 21 | +import org.springframework.transaction.annotation.Transactional; | ||
| 22 | +import org.springframework.web.multipart.MultipartFile; | ||
| 23 | + | ||
| 24 | +/** | ||
| 25 | + * 违规预警信息Service业务层处理 | ||
| 26 | + * | ||
| 27 | + * @author 2c | ||
| 28 | + * @date 2023-05-09 | ||
| 29 | + */ | ||
| 30 | +@Service | ||
| 31 | +public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService | ||
| 32 | +{ | ||
| 33 | + @Autowired | ||
| 34 | + private ViolationWarningInformationMapper violationWarningInformationMapper; | ||
| 35 | + @Autowired | ||
| 36 | + private UploadFileMapper uploadFileMapper; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 查询违规预警信息 | ||
| 40 | + * | ||
| 41 | + * @param id 违规预警信息ID | ||
| 42 | + * @return 违规预警信息 | ||
| 43 | + */ | ||
| 44 | + @Override | ||
| 45 | + public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) { | ||
| 46 | + ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo(); | ||
| 47 | + violationWarningInformationVo.setViolationWarningInformation(violationWarningInformationMapper.selectViolationWarningInformationById(id)); | ||
| 48 | + UploadFile uploadFile = new UploadFile(); | ||
| 49 | + uploadFile.setTableName("violation_warning_information"); | ||
| 50 | + uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString()); | ||
| 51 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 52 | + violationWarningInformationVo.setUploadFiles(list); | ||
| 53 | + return violationWarningInformationVo; | ||
| 54 | + } | ||
| 55 | + | ||
| 56 | + /** | ||
| 57 | + * 查询违规预警信息列表 | ||
| 58 | + * | ||
| 59 | + * @param violationWarningInformation 违规预警信息 | ||
| 60 | + * @return 违规预警信息 | ||
| 61 | + */ | ||
| 62 | + @Override | ||
| 63 | + public List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation) | ||
| 64 | + { | ||
| 65 | + return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation); | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | + /** | ||
| 69 | + * 新增违规预警信息 | ||
| 70 | + * | ||
| 71 | + * @param violationWarningInformation 违规预警信息 | ||
| 72 | + * @return 结果 | ||
| 73 | + */ | ||
| 74 | + @Override | ||
| 75 | + @Transactional | ||
| 76 | + public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException { | ||
| 77 | + violationWarningInformation.setCreateBy(SecurityUtils.getUsername()); | ||
| 78 | + violationWarningInformation.setStatus(0); | ||
| 79 | + Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation); | ||
| 80 | + //文件上传 | ||
| 81 | + for (MultipartFile file : files) { | ||
| 82 | + UploadFile uploadFile = new UploadFile(); | ||
| 83 | + uploadFile.setTableName("violation_warning_information"); | ||
| 84 | + uploadFile.setTableNumber(violationWarningInformation.getId().toString()); | ||
| 85 | + uploadFile.setFileName(file.getOriginalFilename()); | ||
| 86 | + uploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 87 | + uploadFileMapper.insertUploadFile(uploadFile); | ||
| 88 | + } | ||
| 89 | + return result; | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + /** | ||
| 93 | + * 修改违规预警信息 | ||
| 94 | + * | ||
| 95 | + * @param violationWarningInformationVo 违规预警信息 | ||
| 96 | + * @return 结果 | ||
| 97 | + */ | ||
| 98 | + @Override | ||
| 99 | + @Transactional | ||
| 100 | + public int updateViolationWarningInformation(MultipartFile[] files,ViolationWarningInformationVo violationWarningInformationVo) throws IOException { | ||
| 101 | + violationWarningInformationVo.getViolationWarningInformation().setUpdateBy(SecurityUtils.getUsername()); | ||
| 102 | + //查询该合同下的文件上传数据然后删除数据库中的数据和文件 | ||
| 103 | + UploadFile uploadFile = new UploadFile(); | ||
| 104 | + uploadFile.setTableName("violation_warning_information"); | ||
| 105 | + uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString()); | ||
| 106 | + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 107 | + //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件 | ||
| 108 | + if (violationWarningInformationVo.getUploadFiles().size() != 0) { | ||
| 109 | + //获取两个list的交集 | ||
| 110 | + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationWarningInformationVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList()); | ||
| 111 | + //去掉交集得到需要删除的数据 | ||
| 112 | + uploadFileList.removeAll(distinctList); | ||
| 113 | + | ||
| 114 | + for (UploadFile distinctFile : uploadFileList) { | ||
| 115 | + uploadFileMapper.deleteUploadFileById(distinctFile.getId()); | ||
| 116 | + //删除文件 | ||
| 117 | + FileUploadUtils.deleteFile(distinctFile.getFilePath()); | ||
| 118 | + } | ||
| 119 | + } else { | ||
| 120 | + for (UploadFile uploadFile1 : uploadFileList) { | ||
| 121 | + //删除数据库数据 | ||
| 122 | + uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); | ||
| 123 | + //删除文件 | ||
| 124 | + FileUploadUtils.deleteFile(uploadFile1.getFilePath()); | ||
| 125 | + } | ||
| 126 | + } | ||
| 127 | + | ||
| 128 | + //添加新的文件 | ||
| 129 | + for (MultipartFile file : files) { | ||
| 130 | + UploadFile newUploadFile = new UploadFile(); | ||
| 131 | + newUploadFile.setTableName("violation_warning_information"); | ||
| 132 | + newUploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString()); | ||
| 133 | + newUploadFile.setFileName(file.getOriginalFilename()); | ||
| 134 | + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 135 | + uploadFileMapper.insertUploadFile(newUploadFile); | ||
| 136 | + } | ||
| 137 | + return violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformationVo.getViolationWarningInformation()); | ||
| 138 | + } | ||
| 139 | + | ||
| 140 | + /** | ||
| 141 | + * 批量删除违规预警信息 | ||
| 142 | + * | ||
| 143 | + * @param ids 需要删除的违规预警信息ID | ||
| 144 | + * @return 结果 | ||
| 145 | + */ | ||
| 146 | + @Override | ||
| 147 | + @Transactional | ||
| 148 | + public int deleteViolationWarningInformationByIds(Long[] ids) | ||
| 149 | + { | ||
| 150 | + for (Long id : ids) { | ||
| 151 | + ViolationWarningInformation violationWarningInformation = violationWarningInformationMapper.selectViolationWarningInformationById(id); | ||
| 152 | + UploadFile uploadFile = new UploadFile(); | ||
| 153 | + uploadFile.setTableName("violation_warning_information"); | ||
| 154 | + uploadFile.setTableNumber(violationWarningInformation.getId().toString()); | ||
| 155 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 156 | + //遍历删除文件 | ||
| 157 | + for (UploadFile file : list) { | ||
| 158 | + uploadFileMapper.deleteUploadFileById(file.getId()); | ||
| 159 | + FileUploadUtils.deleteFile(file.getFilePath()); | ||
| 160 | + } | ||
| 161 | + } | ||
| 162 | + return violationWarningInformationMapper.deleteViolationWarningInformationByIds(ids); | ||
| 163 | + } | ||
| 164 | + | ||
| 165 | + /** | ||
| 166 | + * 删除违规预警信息信息 | ||
| 167 | + * | ||
| 168 | + * @param id 违规预警信息ID | ||
| 169 | + * @return 结果 | ||
| 170 | + */ | ||
| 171 | + @Override | ||
| 172 | + public int deleteViolationWarningInformationById(Long id) | ||
| 173 | + { | ||
| 174 | + return violationWarningInformationMapper.deleteViolationWarningInformationById(id); | ||
| 175 | + } | ||
| 176 | +} |
trash-workFlow/src/main/java/com/trash/office/controller/ConferenceController.java
0 → 100644
| 1 | +package com.trash.office.controller; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.ArrayList; | ||
| 5 | +import java.util.List; | ||
| 6 | + | ||
| 7 | +import com.alibaba.fastjson.JSON; | ||
| 8 | +import com.trash.office.domain.ContractManagement; | ||
| 9 | +import com.trash.office.domain.UploadFile; | ||
| 10 | +import com.trash.office.domain.vo.ConferenceVo; | ||
| 11 | +import com.trash.office.domain.vo.ContractManagementVo; | ||
| 12 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 13 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 14 | +import org.springframework.web.bind.annotation.*; | ||
| 15 | +import com.trash.common.annotation.Log; | ||
| 16 | +import com.trash.common.core.controller.BaseController; | ||
| 17 | +import com.trash.common.core.domain.AjaxResult; | ||
| 18 | +import com.trash.common.enums.BusinessType; | ||
| 19 | +import com.trash.office.domain.Conference; | ||
| 20 | +import com.trash.office.service.IConferenceService; | ||
| 21 | +import com.trash.common.utils.poi.ExcelUtil; | ||
| 22 | +import com.trash.common.core.page.TableDataInfo; | ||
| 23 | +import org.springframework.web.multipart.MultipartFile; | ||
| 24 | + | ||
| 25 | +/** | ||
| 26 | + * 会议管理Controller | ||
| 27 | + * | ||
| 28 | + * @author 2c | ||
| 29 | + * @date 2023-05-04 | ||
| 30 | + */ | ||
| 31 | +@RestController | ||
| 32 | +@RequestMapping("/office/conference") | ||
| 33 | +public class ConferenceController extends BaseController | ||
| 34 | +{ | ||
| 35 | + @Autowired | ||
| 36 | + private IConferenceService conferenceService; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 查询会议管理列表 | ||
| 40 | + */ | ||
| 41 | + @PreAuthorize("@ss.hasPermi('office:conference:list')") | ||
| 42 | + @GetMapping("/list") | ||
| 43 | + public TableDataInfo list(Conference conference) | ||
| 44 | + { | ||
| 45 | + startPage(); | ||
| 46 | + List<Conference> list = conferenceService.selectConferenceList(conference); | ||
| 47 | + return getDataTable(list); | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 导出会议管理列表 | ||
| 52 | + */ | ||
| 53 | + @PreAuthorize("@ss.hasPermi('office:conference:export')") | ||
| 54 | + @Log(title = "会议管理", businessType = BusinessType.EXPORT) | ||
| 55 | + @GetMapping("/export") | ||
| 56 | + public AjaxResult export(Conference conference) | ||
| 57 | + { | ||
| 58 | + List<Conference> list = conferenceService.selectConferenceList(conference); | ||
| 59 | + ExcelUtil<Conference> util = new ExcelUtil<Conference>(Conference.class); | ||
| 60 | + return util.exportExcel(list, "conference"); | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + /** | ||
| 64 | + * 获取会议管理详细信息 | ||
| 65 | + */ | ||
| 66 | + @PreAuthorize("@ss.hasPermi('office:conference:query')") | ||
| 67 | + @GetMapping(value = "/{id}") | ||
| 68 | + public AjaxResult getInfo(@PathVariable("id") Long id) | ||
| 69 | + { | ||
| 70 | + return AjaxResult.success(conferenceService.selectConferenceById(id)); | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + /** | ||
| 74 | + * 新增会议管理 | ||
| 75 | + */ | ||
| 76 | + @PreAuthorize("@ss.hasPermi('office:conference:add')") | ||
| 77 | + @Log(title = "会议管理", businessType = BusinessType.INSERT) | ||
| 78 | + @PostMapping | ||
| 79 | + public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, Conference conference) throws IOException { | ||
| 80 | + return toAjax(conferenceService.insertConference(files,conference)); | ||
| 81 | + } | ||
| 82 | + | ||
| 83 | + /** | ||
| 84 | + * 修改会议管理 | ||
| 85 | + */ | ||
| 86 | + @PreAuthorize("@ss.hasPermi('office:conference:edit')") | ||
| 87 | + @Log(title = "会议管理", businessType = BusinessType.UPDATE) | ||
| 88 | + @PutMapping | ||
| 89 | + public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String conference,String[] uploadFilesList) throws IOException { | ||
| 90 | + ConferenceVo conferenceVo = new ConferenceVo(); | ||
| 91 | + conferenceVo.setConference(JSON.parseObject(conference, Conference.class)); | ||
| 92 | + List<UploadFile> uploadFileList = new ArrayList<>(); | ||
| 93 | + for (String uploadFile : uploadFilesList) { | ||
| 94 | + UploadFile uploadFile1 = JSON.parseObject(uploadFile,UploadFile.class); | ||
| 95 | + if(uploadFile1!=null){ | ||
| 96 | + if(uploadFile1.getId()!=null){ | ||
| 97 | + uploadFileList.add(uploadFile1); | ||
| 98 | + } | ||
| 99 | + } | ||
| 100 | + } | ||
| 101 | + conferenceVo.setUploadFiles(uploadFileList); | ||
| 102 | + return toAjax(conferenceService.updateConference(files,conferenceVo)); | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + /** | ||
| 106 | + * 删除会议管理 | ||
| 107 | + */ | ||
| 108 | + @PreAuthorize("@ss.hasPermi('office:conference:remove')") | ||
| 109 | + @Log(title = "会议管理", businessType = BusinessType.DELETE) | ||
| 110 | + @DeleteMapping("/{ids}") | ||
| 111 | + public AjaxResult remove(@PathVariable Long[] ids) | ||
| 112 | + { | ||
| 113 | + return toAjax(conferenceService.deleteConferenceByIds(ids)); | ||
| 114 | + } | ||
| 115 | +} |
trash-workFlow/src/main/java/com/trash/office/controller/ContractManagementController.java
| @@ -23,7 +23,7 @@ import org.springframework.web.multipart.MultipartFile; | @@ -23,7 +23,7 @@ import org.springframework.web.multipart.MultipartFile; | ||
| 23 | /** | 23 | /** |
| 24 | * 合同管理Controller | 24 | * 合同管理Controller |
| 25 | * | 25 | * |
| 26 | - * @author trash | 26 | + * @author 2c |
| 27 | * @date 2023-04-27 | 27 | * @date 2023-04-27 |
| 28 | */ | 28 | */ |
| 29 | @RestController | 29 | @RestController |
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsController.java
0 → 100644
| 1 | +package com.trash.office.controller; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.ArrayList; | ||
| 5 | +import java.util.List; | ||
| 6 | + | ||
| 7 | +import com.alibaba.fastjson.JSON; | ||
| 8 | +import com.trash.office.domain.Conference; | ||
| 9 | +import com.trash.office.domain.UploadFile; | ||
| 10 | +import com.trash.office.domain.vo.ConferenceVo; | ||
| 11 | +import com.trash.office.domain.vo.HandleAffairsVo; | ||
| 12 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 13 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 14 | +import org.springframework.web.bind.annotation.*; | ||
| 15 | +import com.trash.common.annotation.Log; | ||
| 16 | +import com.trash.common.core.controller.BaseController; | ||
| 17 | +import com.trash.common.core.domain.AjaxResult; | ||
| 18 | +import com.trash.common.enums.BusinessType; | ||
| 19 | +import com.trash.office.domain.HandleAffairs; | ||
| 20 | +import com.trash.office.service.IHandleAffairsService; | ||
| 21 | +import com.trash.common.utils.poi.ExcelUtil; | ||
| 22 | +import com.trash.common.core.page.TableDataInfo; | ||
| 23 | +import org.springframework.web.multipart.MultipartFile; | ||
| 24 | + | ||
| 25 | +/** | ||
| 26 | + * 办文办事Controller | ||
| 27 | + * | ||
| 28 | + * @author 2c | ||
| 29 | + * @date 2023-05-06 | ||
| 30 | + */ | ||
| 31 | +@RestController | ||
| 32 | +@RequestMapping("/office/handle") | ||
| 33 | +public class HandleAffairsController extends BaseController { | ||
| 34 | + @Autowired | ||
| 35 | + private IHandleAffairsService handleAffairsService; | ||
| 36 | + | ||
| 37 | + /** | ||
| 38 | + * 查询办文办事列表 | ||
| 39 | + */ | ||
| 40 | + @PreAuthorize("@ss.hasPermi('office:handle:list')") | ||
| 41 | + @GetMapping("/list") | ||
| 42 | + public TableDataInfo list(HandleAffairs handleAffairs) { | ||
| 43 | + startPage(); | ||
| 44 | + List<HandleAffairs> list = handleAffairsService.selectHandleAffairsList(handleAffairs); | ||
| 45 | + return getDataTable(list); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * 导出办文办事列表 | ||
| 50 | + */ | ||
| 51 | + @PreAuthorize("@ss.hasPermi('office:handle:export')") | ||
| 52 | + @Log(title = "办文办事", businessType = BusinessType.EXPORT) | ||
| 53 | + @GetMapping("/export") | ||
| 54 | + public AjaxResult export(HandleAffairs handleAffairs) { | ||
| 55 | + List<HandleAffairs> list = handleAffairsService.selectHandleAffairsList(handleAffairs); | ||
| 56 | + ExcelUtil<HandleAffairs> util = new ExcelUtil<HandleAffairs>(HandleAffairs.class); | ||
| 57 | + return util.exportExcel(list, "handle"); | ||
| 58 | + } | ||
| 59 | + | ||
| 60 | + /** | ||
| 61 | + * 获取办文办事详细信息 | ||
| 62 | + */ | ||
| 63 | + @PreAuthorize("@ss.hasPermi('office:handle:query')") | ||
| 64 | + @GetMapping(value = "/{id}") | ||
| 65 | + public AjaxResult getInfo(@PathVariable("id") Long id) { | ||
| 66 | + return AjaxResult.success(handleAffairsService.selectHandleAffairsById(id)); | ||
| 67 | + } | ||
| 68 | + | ||
| 69 | + /** | ||
| 70 | + * 新增办文办事 | ||
| 71 | + */ | ||
| 72 | + @PreAuthorize("@ss.hasPermi('office:handle:add')") | ||
| 73 | + @Log(title = "办文办事", businessType = BusinessType.INSERT) | ||
| 74 | + @PostMapping | ||
| 75 | + public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files,HandleAffairs handleAffairs) throws IOException { | ||
| 76 | + return toAjax(handleAffairsService.insertHandleAffairs(files,handleAffairs)); | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + /** | ||
| 80 | + * 修改办文办事 | ||
| 81 | + */ | ||
| 82 | + @PreAuthorize("@ss.hasPermi('office:handle:edit')") | ||
| 83 | + @Log(title = "办文办事", businessType = BusinessType.UPDATE) | ||
| 84 | + @PutMapping | ||
| 85 | + public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairs,String[] uploadFilesList) throws IOException { | ||
| 86 | + HandleAffairsVo handleAffairsVo = new HandleAffairsVo(); | ||
| 87 | + handleAffairsVo.setHandleAffairs(JSON.parseObject(handleAffairs, HandleAffairs.class)); | ||
| 88 | + List<UploadFile> uploadFileList = new ArrayList<>(); | ||
| 89 | + for (String uploadFile : uploadFilesList) { | ||
| 90 | + UploadFile uploadFile1 = JSON.parseObject(uploadFile,UploadFile.class); | ||
| 91 | + if(uploadFile1!=null){ | ||
| 92 | + if(uploadFile1.getId()!=null){ | ||
| 93 | + uploadFileList.add(uploadFile1); | ||
| 94 | + } | ||
| 95 | + } | ||
| 96 | + } | ||
| 97 | + handleAffairsVo.setUploadFiles(uploadFileList); | ||
| 98 | + return toAjax(handleAffairsService.updateHandleAffairs(files,handleAffairsVo)); | ||
| 99 | + } | ||
| 100 | + | ||
| 101 | + /** | ||
| 102 | + * 删除办文办事 | ||
| 103 | + */ | ||
| 104 | + @PreAuthorize("@ss.hasPermi('office:handle:remove')") | ||
| 105 | + @Log(title = "办文办事", businessType = BusinessType.DELETE) | ||
| 106 | + @DeleteMapping("/{ids}") | ||
| 107 | + public AjaxResult remove(@PathVariable Long[] ids) { | ||
| 108 | + return toAjax(handleAffairsService.deleteHandleAffairsByIds(ids)); | ||
| 109 | + } | ||
| 110 | +} |
trash-workFlow/src/main/java/com/trash/office/controller/LeaveApplicationController.java
0 → 100644
| 1 | +package com.trash.office.controller; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.ArrayList; | ||
| 5 | +import java.util.List; | ||
| 6 | + | ||
| 7 | +import com.alibaba.fastjson.JSON; | ||
| 8 | +import com.trash.common.utils.SecurityUtils; | ||
| 9 | +import com.trash.office.domain.HandleAffairs; | ||
| 10 | +import com.trash.office.domain.UploadFile; | ||
| 11 | +import com.trash.office.domain.vo.HandleAffairsVo; | ||
| 12 | +import com.trash.office.domain.vo.LeaveApplicationVo; | ||
| 13 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 14 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 15 | +import org.springframework.web.bind.annotation.*; | ||
| 16 | +import com.trash.common.annotation.Log; | ||
| 17 | +import com.trash.common.core.controller.BaseController; | ||
| 18 | +import com.trash.common.core.domain.AjaxResult; | ||
| 19 | +import com.trash.common.enums.BusinessType; | ||
| 20 | +import com.trash.office.domain.LeaveApplication; | ||
| 21 | +import com.trash.office.service.ILeaveApplicationService; | ||
| 22 | +import com.trash.common.utils.poi.ExcelUtil; | ||
| 23 | +import com.trash.common.core.page.TableDataInfo; | ||
| 24 | +import org.springframework.web.multipart.MultipartFile; | ||
| 25 | + | ||
| 26 | +/** | ||
| 27 | + * leaveApplicationController | ||
| 28 | + * | ||
| 29 | + * @author 2c | ||
| 30 | + * @date 2023-05-04 | ||
| 31 | + */ | ||
| 32 | +@RestController | ||
| 33 | +@RequestMapping("/office/leaveApplication") | ||
| 34 | +public class LeaveApplicationController extends BaseController | ||
| 35 | +{ | ||
| 36 | + @Autowired | ||
| 37 | + private ILeaveApplicationService leaveApplicationService; | ||
| 38 | + | ||
| 39 | + /** | ||
| 40 | + * 查询leaveApplication列表 | ||
| 41 | + */ | ||
| 42 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:list')") | ||
| 43 | + @GetMapping("/list") | ||
| 44 | + public TableDataInfo list(LeaveApplication leaveApplication) | ||
| 45 | + { | ||
| 46 | + startPage(); | ||
| 47 | + List<LeaveApplication> list = leaveApplicationService.selectLeaveApplicationList(leaveApplication); | ||
| 48 | + return getDataTable(list); | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | + /** | ||
| 52 | + * 导出leaveApplication列表 | ||
| 53 | + */ | ||
| 54 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:export')") | ||
| 55 | + @Log(title = "leaveApplication", businessType = BusinessType.EXPORT) | ||
| 56 | + @GetMapping("/export") | ||
| 57 | + public AjaxResult export(LeaveApplication leaveApplication) | ||
| 58 | + { | ||
| 59 | + List<LeaveApplication> list = leaveApplicationService.selectLeaveApplicationList(leaveApplication); | ||
| 60 | + ExcelUtil<LeaveApplication> util = new ExcelUtil<LeaveApplication>(LeaveApplication.class); | ||
| 61 | + return util.exportExcel(list, "leaveApplication"); | ||
| 62 | + } | ||
| 63 | + | ||
| 64 | + /** | ||
| 65 | + * 获取leaveApplication详细信息 | ||
| 66 | + */ | ||
| 67 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:query')") | ||
| 68 | + @GetMapping(value = "/{id}") | ||
| 69 | + public AjaxResult getInfo(@PathVariable("id") Long id) | ||
| 70 | + { | ||
| 71 | + return AjaxResult.success(leaveApplicationService.selectLeaveApplicationById(id)); | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + /** | ||
| 75 | + * 新增leaveApplication | ||
| 76 | + */ | ||
| 77 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:add')") | ||
| 78 | + @Log(title = "leaveApplication", businessType = BusinessType.INSERT) | ||
| 79 | + @PostMapping | ||
| 80 | + public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, LeaveApplication leaveApplication) throws IOException { | ||
| 81 | + //设置申请人为登陆人 | ||
| 82 | + leaveApplication.setApplicant(SecurityUtils.getUsername()); | ||
| 83 | + return toAjax(leaveApplicationService.insertLeaveApplication(files,leaveApplication)); | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + /** | ||
| 87 | + * 修改leaveApplication | ||
| 88 | + */ | ||
| 89 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:edit')") | ||
| 90 | + @Log(title = "leaveApplication", businessType = BusinessType.UPDATE) | ||
| 91 | + @PutMapping | ||
| 92 | + public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String leaveApplication,String[] uploadFilesList) throws IOException { | ||
| 93 | + LeaveApplicationVo leaveApplicationVo = new LeaveApplicationVo(); | ||
| 94 | + leaveApplicationVo.setLeaveApplication(JSON.parseObject(leaveApplication, LeaveApplication.class)); | ||
| 95 | + List<UploadFile> uploadFileList = new ArrayList<>(); | ||
| 96 | + for (String uploadFile : uploadFilesList) { | ||
| 97 | + UploadFile uploadFile1 = JSON.parseObject(uploadFile,UploadFile.class); | ||
| 98 | + if(uploadFile1!=null){ | ||
| 99 | + if(uploadFile1.getId()!=null){ | ||
| 100 | + uploadFileList.add(uploadFile1); | ||
| 101 | + } | ||
| 102 | + } | ||
| 103 | + } | ||
| 104 | + leaveApplicationVo.setUploadFiles(uploadFileList); | ||
| 105 | + return toAjax(leaveApplicationService.updateLeaveApplication(files,leaveApplicationVo)); | ||
| 106 | + } | ||
| 107 | + | ||
| 108 | + /** | ||
| 109 | + * 删除leaveApplication | ||
| 110 | + */ | ||
| 111 | + @PreAuthorize("@ss.hasPermi('office:leaveApplication:remove')") | ||
| 112 | + @Log(title = "leaveApplication", businessType = BusinessType.DELETE) | ||
| 113 | + @DeleteMapping("/{ids}") | ||
| 114 | + public AjaxResult remove(@PathVariable Long[] ids) | ||
| 115 | + { | ||
| 116 | + return toAjax(leaveApplicationService.deleteLeaveApplicationByIds(ids)); | ||
| 117 | + } | ||
| 118 | +} |
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
0 → 100644
| 1 | +package com.trash.office.controller; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 5 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 6 | +import org.springframework.web.bind.annotation.GetMapping; | ||
| 7 | +import org.springframework.web.bind.annotation.PostMapping; | ||
| 8 | +import org.springframework.web.bind.annotation.PutMapping; | ||
| 9 | +import org.springframework.web.bind.annotation.DeleteMapping; | ||
| 10 | +import org.springframework.web.bind.annotation.PathVariable; | ||
| 11 | +import org.springframework.web.bind.annotation.RequestBody; | ||
| 12 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 13 | +import org.springframework.web.bind.annotation.RestController; | ||
| 14 | +import com.trash.common.annotation.Log; | ||
| 15 | +import com.trash.common.core.controller.BaseController; | ||
| 16 | +import com.trash.common.core.domain.AjaxResult; | ||
| 17 | +import com.trash.common.enums.BusinessType; | ||
| 18 | +import com.trash.office.domain.LogisticsManagement; | ||
| 19 | +import com.trash.office.service.ILogisticsManagementService; | ||
| 20 | +import com.trash.common.utils.poi.ExcelUtil; | ||
| 21 | +import com.trash.common.core.page.TableDataInfo; | ||
| 22 | + | ||
| 23 | +/** | ||
| 24 | + * 后勤管理Controller | ||
| 25 | + * | ||
| 26 | + * @author 2c | ||
| 27 | + * @date 2023-05-08 | ||
| 28 | + */ | ||
| 29 | +@RestController | ||
| 30 | +@RequestMapping("/office/logistics") | ||
| 31 | +public class LogisticsManagementController extends BaseController | ||
| 32 | +{ | ||
| 33 | + @Autowired | ||
| 34 | + private ILogisticsManagementService logisticsManagementService; | ||
| 35 | + | ||
| 36 | + /** | ||
| 37 | + * 查询后勤管理列表 | ||
| 38 | + */ | ||
| 39 | + @PreAuthorize("@ss.hasPermi('office:logistics:list')") | ||
| 40 | + @GetMapping("/list") | ||
| 41 | + public TableDataInfo list(LogisticsManagement logisticsManagement) | ||
| 42 | + { | ||
| 43 | + startPage(); | ||
| 44 | + List<LogisticsManagement> list = logisticsManagementService.selectLogisticsManagementList(logisticsManagement); | ||
| 45 | + return getDataTable(list); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * 导出后勤管理列表 | ||
| 50 | + */ | ||
| 51 | + @PreAuthorize("@ss.hasPermi('office:logistics:export')") | ||
| 52 | + @Log(title = "后勤管理", businessType = BusinessType.EXPORT) | ||
| 53 | + @GetMapping("/export") | ||
| 54 | + public AjaxResult export(LogisticsManagement logisticsManagement) | ||
| 55 | + { | ||
| 56 | + List<LogisticsManagement> list = logisticsManagementService.selectLogisticsManagementList(logisticsManagement); | ||
| 57 | + ExcelUtil<LogisticsManagement> util = new ExcelUtil<LogisticsManagement>(LogisticsManagement.class); | ||
| 58 | + return util.exportExcel(list, "logistics"); | ||
| 59 | + } | ||
| 60 | + | ||
| 61 | + /** | ||
| 62 | + * 获取后勤管理详细信息 | ||
| 63 | + */ | ||
| 64 | + @PreAuthorize("@ss.hasPermi('office:logistics:query')") | ||
| 65 | + @GetMapping(value = "/{id}") | ||
| 66 | + public AjaxResult getInfo(@PathVariable("id") Long id) | ||
| 67 | + { | ||
| 68 | + return AjaxResult.success(logisticsManagementService.selectLogisticsManagementById(id)); | ||
| 69 | + } | ||
| 70 | + | ||
| 71 | + /** | ||
| 72 | + * 新增后勤管理 | ||
| 73 | + */ | ||
| 74 | + @PreAuthorize("@ss.hasPermi('office:logistics:add')") | ||
| 75 | + @Log(title = "后勤管理", businessType = BusinessType.INSERT) | ||
| 76 | + @PostMapping | ||
| 77 | + public AjaxResult add(@RequestBody LogisticsManagement logisticsManagement) | ||
| 78 | + { | ||
| 79 | + return toAjax(logisticsManagementService.insertLogisticsManagement(logisticsManagement)); | ||
| 80 | + } | ||
| 81 | + | ||
| 82 | + /** | ||
| 83 | + * 修改后勤管理 | ||
| 84 | + */ | ||
| 85 | + @PreAuthorize("@ss.hasPermi('office:logistics:edit')") | ||
| 86 | + @Log(title = "后勤管理", businessType = BusinessType.UPDATE) | ||
| 87 | + @PutMapping | ||
| 88 | + public AjaxResult edit(@RequestBody LogisticsManagement logisticsManagement) | ||
| 89 | + { | ||
| 90 | + return toAjax(logisticsManagementService.updateLogisticsManagement(logisticsManagement)); | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + /** | ||
| 94 | + * 删除后勤管理 | ||
| 95 | + */ | ||
| 96 | + @PreAuthorize("@ss.hasPermi('office:logistics:remove')") | ||
| 97 | + @Log(title = "后勤管理", businessType = BusinessType.DELETE) | ||
| 98 | + @DeleteMapping("/{ids}") | ||
| 99 | + public AjaxResult remove(@PathVariable Long[] ids) | ||
| 100 | + { | ||
| 101 | + return toAjax(logisticsManagementService.deleteLogisticsManagementByIds(ids)); | ||
| 102 | + } | ||
| 103 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/Conference.java
0 → 100644
| 1 | +package com.trash.office.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 5 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 7 | +import com.trash.common.annotation.Excel; | ||
| 8 | +import com.trash.common.core.domain.BaseEntity; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 会议管理对象 office_conference | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-04 | ||
| 15 | + */ | ||
| 16 | +public class Conference extends BaseEntity | ||
| 17 | +{ | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** $column.columnComment */ | ||
| 21 | + private Long id; | ||
| 22 | + | ||
| 23 | + /** 会议时间 */ | ||
| 24 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 25 | + @Excel(name = "会议时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | ||
| 26 | + private Date conferenceTime; | ||
| 27 | + | ||
| 28 | + /** 会议地点 */ | ||
| 29 | + @Excel(name = "会议地点") | ||
| 30 | + private String conferenceSite; | ||
| 31 | + | ||
| 32 | + /** 科室id */ | ||
| 33 | + @Excel(name = "科室id") | ||
| 34 | + private Long deptId; | ||
| 35 | + | ||
| 36 | + /** 科室名称 */ | ||
| 37 | + @Excel(name = "科室名称") | ||
| 38 | + private String deptName; | ||
| 39 | + | ||
| 40 | + /** 参会人员 */ | ||
| 41 | + @Excel(name = "参会人员") | ||
| 42 | + private String staff; | ||
| 43 | + | ||
| 44 | + /** 会议主题 */ | ||
| 45 | + @Excel(name = "会议主题") | ||
| 46 | + private String subject; | ||
| 47 | + | ||
| 48 | + /** 会议内容 */ | ||
| 49 | + @Excel(name = "会议内容") | ||
| 50 | + private String content; | ||
| 51 | + | ||
| 52 | + /** 会议要求 */ | ||
| 53 | + @Excel(name = "会议要求") | ||
| 54 | + private String requirement; | ||
| 55 | + | ||
| 56 | + /** 通知区级分平台或者公司分平台 | ||
| 57 | + * 1:区级分平台，2：公司分平台，1,2：都通知 | ||
| 58 | + */ | ||
| 59 | + @Excel(name = "通知区级分平台或者公司分平台") | ||
| 60 | + private String notify; | ||
| 61 | + | ||
| 62 | + private Integer status; | ||
| 63 | + | ||
| 64 | + public Integer getStatus() { | ||
| 65 | + return status; | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | + public void setStatus(Integer status) { | ||
| 69 | + this.status = status; | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + public String getRequirement() { | ||
| 73 | + return requirement; | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + public void setRequirement(String requirement) { | ||
| 77 | + this.requirement = requirement; | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + public void setId(Long id) | ||
| 81 | + { | ||
| 82 | + this.id = id; | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + public Long getId() | ||
| 86 | + { | ||
| 87 | + return id; | ||
| 88 | + } | ||
| 89 | + public void setConferenceTime(Date conferenceTime) | ||
| 90 | + { | ||
| 91 | + this.conferenceTime = conferenceTime; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + public Date getConferenceTime() | ||
| 95 | + { | ||
| 96 | + return conferenceTime; | ||
| 97 | + } | ||
| 98 | + public void setConferenceSite(String conferenceSite) | ||
| 99 | + { | ||
| 100 | + this.conferenceSite = conferenceSite; | ||
| 101 | + } | ||
| 102 | + | ||
| 103 | + public String getConferenceSite() | ||
| 104 | + { | ||
| 105 | + return conferenceSite; | ||
| 106 | + } | ||
| 107 | + public void setDeptId(Long deptId) | ||
| 108 | + { | ||
| 109 | + this.deptId = deptId; | ||
| 110 | + } | ||
| 111 | + | ||
| 112 | + public Long getDeptId() | ||
| 113 | + { | ||
| 114 | + return deptId; | ||
| 115 | + } | ||
| 116 | + public void setDeptName(String deptName) | ||
| 117 | + { | ||
| 118 | + this.deptName = deptName; | ||
| 119 | + } | ||
| 120 | + | ||
| 121 | + public String getDeptName() | ||
| 122 | + { | ||
| 123 | + return deptName; | ||
| 124 | + } | ||
| 125 | + public void setStaff(String staff) | ||
| 126 | + { | ||
| 127 | + this.staff = staff; | ||
| 128 | + } | ||
| 129 | + | ||
| 130 | + public String getStaff() | ||
| 131 | + { | ||
| 132 | + return staff; | ||
| 133 | + } | ||
| 134 | + public void setSubject(String subject) | ||
| 135 | + { | ||
| 136 | + this.subject = subject; | ||
| 137 | + } | ||
| 138 | + | ||
| 139 | + public String getSubject() | ||
| 140 | + { | ||
| 141 | + return subject; | ||
| 142 | + } | ||
| 143 | + public void setContent(String content) | ||
| 144 | + { | ||
| 145 | + this.content = content; | ||
| 146 | + } | ||
| 147 | + | ||
| 148 | + public String getContent() | ||
| 149 | + { | ||
| 150 | + return content; | ||
| 151 | + } | ||
| 152 | + public void setNotify(String notify) | ||
| 153 | + { | ||
| 154 | + this.notify = notify; | ||
| 155 | + } | ||
| 156 | + | ||
| 157 | + public String getNotify() | ||
| 158 | + { | ||
| 159 | + return notify; | ||
| 160 | + } | ||
| 161 | + | ||
| 162 | + @Override | ||
| 163 | + public String toString() { | ||
| 164 | + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) | ||
| 165 | + .append("id", getId()) | ||
| 166 | + .append("conferenceTime", getConferenceTime()) | ||
| 167 | + .append("conferenceSite", getConferenceSite()) | ||
| 168 | + .append("deptId", getDeptId()) | ||
| 169 | + .append("deptName", getDeptName()) | ||
| 170 | + .append("staff", getStaff()) | ||
| 171 | + .append("subject", getSubject()) | ||
| 172 | + .append("content", getContent()) | ||
| 173 | + .append("notify", getNotify()) | ||
| 174 | + .append("createTime", getCreateTime()) | ||
| 175 | + .append("createBy", getCreateBy()) | ||
| 176 | + .append("updateTime", getUpdateTime()) | ||
| 177 | + .append("updateBy", getUpdateBy()) | ||
| 178 | + .toString(); | ||
| 179 | + } | ||
| 180 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/ContractManagement.java
| @@ -9,7 +9,7 @@ import com.trash.common.annotation.Excel; | @@ -9,7 +9,7 @@ import com.trash.common.annotation.Excel; | ||
| 9 | import com.trash.common.core.domain.BaseEntity; | 9 | import com.trash.common.core.domain.BaseEntity; |
| 10 | 10 | ||
| 11 | /** | 11 | /** |
| 12 | - * 合同管理对象 contract_management | 12 | + * 合同管理对象 office_contract_management |
| 13 | * | 13 | * |
| 14 | * @author trash | 14 | * @author trash |
| 15 | * @date 2023-04-27 | 15 | * @date 2023-04-27 |
| @@ -84,6 +84,17 @@ public class ContractManagement extends BaseEntity { | @@ -84,6 +84,17 @@ public class ContractManagement extends BaseEntity { | ||
| 84 | @Excel(name = "责任科室") | 84 | @Excel(name = "责任科室") |
| 85 | private String deptname; | 85 | private String deptname; |
| 86 | 86 | ||
| 87 | + /** 审批状态 0待审核/1审核通过/2驳回 */ | ||
| 88 | + @Excel(name = "审批状态") | ||
| 89 | + private Integer status; | ||
| 90 | + | ||
| 91 | + public Integer getStatus() { | ||
| 92 | + return status; | ||
| 93 | + } | ||
| 94 | + | ||
| 95 | + public void setStatus(Integer status) { | ||
| 96 | + this.status = status; | ||
| 97 | + } | ||
| 87 | 98 | ||
| 88 | public void setId(Long id) { | 99 | public void setId(Long id) { |
| 89 | this.id = id; | 100 | this.id = id; |
trash-workFlow/src/main/java/com/trash/office/domain/HandleAffairs.java
0 → 100644
| 1 | +package com.trash.office.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | + | ||
| 5 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 7 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 8 | +import com.trash.common.annotation.Excel; | ||
| 9 | +import com.trash.common.core.domain.BaseEntity; | ||
| 10 | + | ||
| 11 | +/** | ||
| 12 | + * 办文办事对象 office_handle_affairs | ||
| 13 | + * | ||
| 14 | + * @author 2c | ||
| 15 | + * @date 2023-05-06 | ||
| 16 | + */ | ||
| 17 | +public class HandleAffairs extends BaseEntity { | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * $column.columnComment | ||
| 22 | + */ | ||
| 23 | + private Long id; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 来文单位 | ||
| 27 | + */ | ||
| 28 | + @Excel(name = "来文单位") | ||
| 29 | + private String company; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 收文时间 | ||
| 33 | + */ | ||
| 34 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 35 | + @Excel(name = "收文时间", width = 30, dateFormat = "yyyy-MM-dd") | ||
| 36 | + private Date receiveTime; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 文件标题 | ||
| 40 | + */ | ||
| 41 | + @Excel(name = "文件标题") | ||
| 42 | + private String title; | ||
| 43 | + | ||
| 44 | + /** | ||
| 45 | + * 办文办事类型0:传阅学习类，1:公文批办类，2:热线举报，3：上级信访 | ||
| 46 | + */ | ||
| 47 | + @Excel(name = "办文办事类型") | ||
| 48 | + private String type; | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 诉求 | ||
| 52 | + */ | ||
| 53 | + @Excel(name = "诉求") | ||
| 54 | + private String appeal; | ||
| 55 | + | ||
| 56 | + /** | ||
| 57 | + * 信访单位or人 | ||
| 58 | + */ | ||
| 59 | + @Excel(name = "信访单位or人") | ||
| 60 | + private String sendPerson; | ||
| 61 | + | ||
| 62 | + /** | ||
| 63 | + * 信访日期 | ||
| 64 | + */ | ||
| 65 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 66 | + @Excel(name = "信访日期", width = 30, dateFormat = "yyyy-MM-dd") | ||
| 67 | + private Date sendDate; | ||
| 68 | + | ||
| 69 | + /** | ||
| 70 | + * 是否已阅 | ||
| 71 | + */ | ||
| 72 | + @Excel(name = "是否已阅") | ||
| 73 | + private Integer isRead; | ||
| 74 | + | ||
| 75 | + /** | ||
| 76 | + * 办理意见 | ||
| 77 | + */ | ||
| 78 | + @Excel(name = "办理意见") | ||
| 79 | + private String opinion; | ||
| 80 | + | ||
| 81 | + /** | ||
| 82 | + * 相关部门意见 | ||
| 83 | + */ | ||
| 84 | + @Excel(name = "相关部门意见") | ||
| 85 | + private String deptOpinion; | ||
| 86 | + | ||
| 87 | + /** | ||
| 88 | + * 审批状态 | ||
| 89 | + */ | ||
| 90 | + @Excel(name = "审批状态") | ||
| 91 | + private Integer status; | ||
| 92 | + | ||
| 93 | + public Date getSendDate() { | ||
| 94 | + return sendDate; | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + public void setSendDate(Date sendDate) { | ||
| 98 | + this.sendDate = sendDate; | ||
| 99 | + } | ||
| 100 | + | ||
| 101 | + public void setId(Long id) { | ||
| 102 | + this.id = id; | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + public Long getId() { | ||
| 106 | + return id; | ||
| 107 | + } | ||
| 108 | + | ||
| 109 | + public void setCompany(String company) { | ||
| 110 | + this.company = company; | ||
| 111 | + } | ||
| 112 | + | ||
| 113 | + public String getCompany() { | ||
| 114 | + return company; | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + public void setReceiveTime(Date receiveTime) { | ||
| 118 | + this.receiveTime = receiveTime; | ||
| 119 | + } | ||
| 120 | + | ||
| 121 | + public Date getReceiveTime() { | ||
| 122 | + return receiveTime; | ||
| 123 | + } | ||
| 124 | + | ||
| 125 | + public void setTitle(String title) { | ||
| 126 | + this.title = title; | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + public String getTitle() { | ||
| 130 | + return title; | ||
| 131 | + } | ||
| 132 | + | ||
| 133 | + public void setType(String type) { | ||
| 134 | + this.type = type; | ||
| 135 | + } | ||
| 136 | + | ||
| 137 | + public String getType() { | ||
| 138 | + return type; | ||
| 139 | + } | ||
| 140 | + | ||
| 141 | + public void setAppeal(String appeal) { | ||
| 142 | + this.appeal = appeal; | ||
| 143 | + } | ||
| 144 | + | ||
| 145 | + public String getAppeal() { | ||
| 146 | + return appeal; | ||
| 147 | + } | ||
| 148 | + | ||
| 149 | + public void setSendPerson(String sendPerson) { | ||
| 150 | + this.sendPerson = sendPerson; | ||
| 151 | + } | ||
| 152 | + | ||
| 153 | + public String getSendPerson() { | ||
| 154 | + return sendPerson; | ||
| 155 | + } | ||
| 156 | + | ||
| 157 | + public void setIsRead(Integer isRead) { | ||
| 158 | + this.isRead = isRead; | ||
| 159 | + } | ||
| 160 | + | ||
| 161 | + public Integer getIsRead() { | ||
| 162 | + return isRead; | ||
| 163 | + } | ||
| 164 | + | ||
| 165 | + public void setOpinion(String opinion) { | ||
| 166 | + this.opinion = opinion; | ||
| 167 | + } | ||
| 168 | + | ||
| 169 | + public String getOpinion() { | ||
| 170 | + return opinion; | ||
| 171 | + } | ||
| 172 | + | ||
| 173 | + public void setDeptOpinion(String deptOpinion) { | ||
| 174 | + this.deptOpinion = deptOpinion; | ||
| 175 | + } | ||
| 176 | + | ||
| 177 | + public String getDeptOpinion() { | ||
| 178 | + return deptOpinion; | ||
| 179 | + } | ||
| 180 | + | ||
| 181 | + public void setStatus(Integer status) { | ||
| 182 | + this.status = status; | ||
| 183 | + } | ||
| 184 | + | ||
| 185 | + public Integer getStatus() { | ||
| 186 | + return status; | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + @Override | ||
| 190 | + public String toString() { | ||
| 191 | + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) | ||
| 192 | + .append("id", getId()) | ||
| 193 | + .append("company", getCompany()) | ||
| 194 | + .append("receiveTime", getReceiveTime()) | ||
| 195 | + .append("title", getTitle()) | ||
| 196 | + .append("type", getType()) | ||
| 197 | + .append("appeal", getAppeal()) | ||
| 198 | + .append("sendPerson", getSendPerson()) | ||
| 199 | + .append("sendDate", getSendDate()) | ||
| 200 | + .append("isRead", getIsRead()) | ||
| 201 | + .append("opinion", getOpinion()) | ||
| 202 | + .append("deptOpinion", getDeptOpinion()) | ||
| 203 | + .append("status", getStatus()) | ||
| 204 | + .append("createTime", getCreateTime()) | ||
| 205 | + .append("createBy", getCreateBy()) | ||
| 206 | + .append("updateTime", getUpdateTime()) | ||
| 207 | + .append("updateBy", getUpdateBy()) | ||
| 208 | + .toString(); | ||
| 209 | + } | ||
| 210 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/LeaveApplication.java
0 → 100644
| 1 | +package com.trash.office.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 5 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 7 | +import com.trash.common.annotation.Excel; | ||
| 8 | +import com.trash.common.core.domain.BaseEntity; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * leaveApplication对象 office_leave_application | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-04 | ||
| 15 | + */ | ||
| 16 | +public class LeaveApplication extends BaseEntity | ||
| 17 | +{ | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** $column.columnComment */ | ||
| 21 | + private Long id; | ||
| 22 | + | ||
| 23 | + /** 申请人 */ | ||
| 24 | + @Excel(name = "申请人") | ||
| 25 | + private String applicant; | ||
| 26 | + | ||
| 27 | + /** 部门id */ | ||
| 28 | + @Excel(name = "部门id") | ||
| 29 | + private Long deptId; | ||
| 30 | + | ||
| 31 | + /** 职务id */ | ||
| 32 | + @Excel(name = "职务id") | ||
| 33 | + private Long positionId; | ||
| 34 | + | ||
| 35 | + | ||
| 36 | + /** 联系方式 */ | ||
| 37 | + @Excel(name = "联系方式") | ||
| 38 | + private String phone; | ||
| 39 | + | ||
| 40 | + /** 请假类型 */ | ||
| 41 | + @Excel(name = "请假类型") | ||
| 42 | + private String type; | ||
| 43 | + | ||
| 44 | + /** 请假开始时间 */ | ||
| 45 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 46 | + @Excel(name = "请假开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | ||
| 47 | + private Date beginDate; | ||
| 48 | + | ||
| 49 | + /** 请假结束时间 */ | ||
| 50 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 51 | + @Excel(name = "请假结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | ||
| 52 | + private Date endDate; | ||
| 53 | + | ||
| 54 | + /** 请假天数 */ | ||
| 55 | + @Excel(name = "请假天数") | ||
| 56 | + private String numberDays; | ||
| 57 | + | ||
| 58 | + /** 请假事由 */ | ||
| 59 | + private String content; | ||
| 60 | + | ||
| 61 | + /** 审批状态 0待审核/1审核通过/2驳回 */ | ||
| 62 | + @Excel(name = "审批状态") | ||
| 63 | + private Integer status; | ||
| 64 | + | ||
| 65 | + public void setId(Long id) | ||
| 66 | + { | ||
| 67 | + this.id = id; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + public Long getId() | ||
| 71 | + { | ||
| 72 | + return id; | ||
| 73 | + } | ||
| 74 | + public void setApplicant(String applicant) | ||
| 75 | + { | ||
| 76 | + this.applicant = applicant; | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + public String getApplicant() | ||
| 80 | + { | ||
| 81 | + return applicant; | ||
| 82 | + } | ||
| 83 | + public void setDeptId(Long deptId) | ||
| 84 | + { | ||
| 85 | + this.deptId = deptId; | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + public Long getDeptId() | ||
| 89 | + { | ||
| 90 | + return deptId; | ||
| 91 | + } | ||
| 92 | + public void setPositionId(Long positionId) | ||
| 93 | + { | ||
| 94 | + this.positionId = positionId; | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + public Long getPositionId() | ||
| 98 | + { | ||
| 99 | + return positionId; | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + public void setPhone(String phone) | ||
| 103 | + { | ||
| 104 | + this.phone = phone; | ||
| 105 | + } | ||
| 106 | + | ||
| 107 | + public String getPhone() | ||
| 108 | + { | ||
| 109 | + return phone; | ||
| 110 | + } | ||
| 111 | + public void setType(String type) | ||
| 112 | + { | ||
| 113 | + this.type = type; | ||
| 114 | + } | ||
| 115 | + | ||
| 116 | + public String getType() | ||
| 117 | + { | ||
| 118 | + return type; | ||
| 119 | + } | ||
| 120 | + public void setBeginDate(Date beginDate) | ||
| 121 | + { | ||
| 122 | + this.beginDate = beginDate; | ||
| 123 | + } | ||
| 124 | + | ||
| 125 | + public Date getBeginDate() | ||
| 126 | + { | ||
| 127 | + return beginDate; | ||
| 128 | + } | ||
| 129 | + public void setEndDate(Date endDate) | ||
| 130 | + { | ||
| 131 | + this.endDate = endDate; | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + public Date getEndDate() | ||
| 135 | + { | ||
| 136 | + return endDate; | ||
| 137 | + } | ||
| 138 | + public void setNumberDays(String numberDays) | ||
| 139 | + { | ||
| 140 | + this.numberDays = numberDays; | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + public String getNumberDays() | ||
| 144 | + { | ||
| 145 | + return numberDays; | ||
| 146 | + } | ||
| 147 | + public void setContent(String content) | ||
| 148 | + { | ||
| 149 | + this.content = content; | ||
| 150 | + } | ||
| 151 | + | ||
| 152 | + public String getContent() | ||
| 153 | + { | ||
| 154 | + return content; | ||
| 155 | + } | ||
| 156 | + public void setStatus(Integer status) | ||
| 157 | + { | ||
| 158 | + this.status = status; | ||
| 159 | + } | ||
| 160 | + | ||
| 161 | + public Integer getStatus() | ||
| 162 | + { | ||
| 163 | + return status; | ||
| 164 | + } | ||
| 165 | + | ||
| 166 | + @Override | ||
| 167 | + public String toString() { | ||
| 168 | + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) | ||
| 169 | + .append("id", getId()) | ||
| 170 | + .append("applicant", getApplicant()) | ||
| 171 | + .append("deptId", getDeptId()) | ||
| 172 | + .append("positionId", getPositionId()) | ||
| 173 | + .append("phone", getPhone()) | ||
| 174 | + .append("type", getType()) | ||
| 175 | + .append("beginDate", getBeginDate()) | ||
| 176 | + .append("endDate", getEndDate()) | ||
| 177 | + .append("numberDays", getNumberDays()) | ||
| 178 | + .append("content", getContent()) | ||
| 179 | + .append("status", getStatus()) | ||
| 180 | + .append("createTime", getCreateTime()) | ||
| 181 | + .append("createBy", getCreateBy()) | ||
| 182 | + .append("updateTime", getUpdateTime()) | ||
| 183 | + .append("updateBy", getUpdateBy()) | ||
| 184 | + .toString(); | ||
| 185 | + } | ||
| 186 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagement.java
0 → 100644
| 1 | +package com.trash.office.domain; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 5 | +import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| 6 | +import org.apache.commons.lang3.builder.ToStringStyle; | ||
| 7 | +import com.trash.common.annotation.Excel; | ||
| 8 | +import com.trash.common.core.domain.BaseEntity; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 后勤管理对象 office_logistics_management | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-08 | ||
| 15 | + */ | ||
| 16 | +public class LogisticsManagement extends BaseEntity | ||
| 17 | +{ | ||
| 18 | + private static final long serialVersionUID = 1L; | ||
| 19 | + | ||
| 20 | + /** $column.columnComment */ | ||
| 21 | + private Long id; | ||
| 22 | + | ||
| 23 | + /** 申请类型：1.用章申请，2.物品申请，3.物品采购申请 */ | ||
| 24 | + @Excel(name = "申请类型") | ||
| 25 | + private String type; | ||
| 26 | + | ||
| 27 | + /** 申请部门 */ | ||
| 28 | + @Excel(name = "申请部门") | ||
| 29 | + private Integer deptId; | ||
| 30 | + | ||
| 31 | + /** 用章类型 */ | ||
| 32 | + @Excel(name = "用章类型") | ||
| 33 | + private String sealType; | ||
| 34 | + | ||
| 35 | + /** 用章更新时间 */ | ||
| 36 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 37 | + @Excel(name = "用章更新时间", width = 30, dateFormat = "yyyy-MM-dd") | ||
| 38 | + private Date sealUpdateTime; | ||
| 39 | + | ||
| 40 | + /** 结束时间 */ | ||
| 41 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 42 | + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") | ||
| 43 | + private Date sealEndTime; | ||
| 44 | + | ||
| 45 | + /** 用途 */ | ||
| 46 | + @Excel(name = "用途") | ||
| 47 | + private String purpose; | ||
| 48 | + | ||
| 49 | + /** 申请人 */ | ||
| 50 | + @Excel(name = "申请人") | ||
| 51 | + private String staff; | ||
| 52 | + | ||
| 53 | + /** 申请日期 */ | ||
| 54 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 55 | + @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd") | ||
| 56 | + private Date useDate; | ||
| 57 | + | ||
| 58 | + /** 物品名称 */ | ||
| 59 | + @Excel(name = "物品名称") | ||
| 60 | + private String goodsName; | ||
| 61 | + | ||
| 62 | + /** 数量 */ | ||
| 63 | + @Excel(name = "数量") | ||
| 64 | + private Integer quantity; | ||
| 65 | + | ||
| 66 | + /** 审核状态 */ | ||
| 67 | + @Excel(name = "审核状态") | ||
| 68 | + private Integer status; | ||
| 69 | + | ||
| 70 | + public void setId(Long id) | ||
| 71 | + { | ||
| 72 | + this.id = id; | ||
| 73 | + } | ||
| 74 | + | ||
| 75 | + public Long getId() | ||
| 76 | + { | ||
| 77 | + return id; | ||
| 78 | + } | ||
| 79 | + public void setType(String type) | ||
| 80 | + { | ||
| 81 | + this.type = type; | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + public String getType() | ||
| 85 | + { | ||
| 86 | + return type; | ||
| 87 | + } | ||
| 88 | + public void setDeptId(Integer deptId) | ||
| 89 | + { | ||
| 90 | + this.deptId = deptId; | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + public Integer getDeptId() | ||
| 94 | + { | ||
| 95 | + return deptId; | ||
| 96 | + } | ||
| 97 | + public void setSealType(String sealType) | ||
| 98 | + { | ||
| 99 | + this.sealType = sealType; | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + public String getSealType() | ||
| 103 | + { | ||
| 104 | + return sealType; | ||
| 105 | + } | ||
| 106 | + public void setSealUpdateTime(Date sealUpdateTime) | ||
| 107 | + { | ||
| 108 | + this.sealUpdateTime = sealUpdateTime; | ||
| 109 | + } | ||
| 110 | + | ||
| 111 | + public Date getSealUpdateTime() | ||
| 112 | + { | ||
| 113 | + return sealUpdateTime; | ||
| 114 | + } | ||
| 115 | + public void setSealEndTime(Date sealEndTime) | ||
| 116 | + { | ||
| 117 | + this.sealEndTime = sealEndTime; | ||
| 118 | + } | ||
| 119 | + | ||
| 120 | + public Date getSealEndTime() | ||
| 121 | + { | ||
| 122 | + return sealEndTime; | ||
| 123 | + } | ||
| 124 | + public void setPurpose(String purpose) | ||
| 125 | + { | ||
| 126 | + this.purpose = purpose; | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + public String getPurpose() | ||
| 130 | + { | ||
| 131 | + return purpose; | ||
| 132 | + } | ||
| 133 | + public void setStaff(String staff) | ||
| 134 | + { | ||
| 135 | + this.staff = staff; | ||
| 136 | + } | ||
| 137 | + | ||
| 138 | + public String getStaff() | ||
| 139 | + { | ||
| 140 | + return staff; | ||
| 141 | + } | ||
| 142 | + public void setUseDate(Date useDate) | ||
| 143 | + { | ||
| 144 | + this.useDate = useDate; | ||
| 145 | + } | ||
| 146 | + | ||
| 147 | + public Date getUseDate() | ||
| 148 | + { | ||
| 149 | + return useDate; | ||
| 150 | + } | ||
| 151 | + public void setGoodsName(String goodsName) | ||
| 152 | + { | ||
| 153 | + this.goodsName = goodsName; | ||
| 154 | + } | ||
| 155 | + | ||
| 156 | + public String getGoodsName() | ||
| 157 | + { | ||
| 158 | + return goodsName; | ||
| 159 | + } | ||
| 160 | + public void setQuantity(Integer quantity) | ||
| 161 | + { | ||
| 162 | + this.quantity = quantity; | ||
| 163 | + } | ||
| 164 | + | ||
| 165 | + public Integer getQuantity() | ||
| 166 | + { | ||
| 167 | + return quantity; | ||
| 168 | + } | ||
| 169 | + public void setStatus(Integer status) | ||
| 170 | + { | ||
| 171 | + this.status = status; | ||
| 172 | + } | ||
| 173 | + | ||
| 174 | + public Integer getStatus() | ||
| 175 | + { | ||
| 176 | + return status; | ||
| 177 | + } | ||
| 178 | + | ||
| 179 | + @Override | ||
| 180 | + public String toString() { | ||
| 181 | + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) | ||
| 182 | + .append("id", getId()) | ||
| 183 | + .append("type", getType()) | ||
| 184 | + .append("deptId", getDeptId()) | ||
| 185 | + .append("sealType", getSealType()) | ||
| 186 | + .append("sealUpdateTime", getSealUpdateTime()) | ||
| 187 | + .append("sealEndTime", getSealEndTime()) | ||
| 188 | + .append("purpose", getPurpose()) | ||
| 189 | + .append("staff", getStaff()) | ||
| 190 | + .append("useDate", getUseDate()) | ||
| 191 | + .append("goodsName", getGoodsName()) | ||
| 192 | + .append("quantity", getQuantity()) | ||
| 193 | + .append("status", getStatus()) | ||
| 194 | + .append("createTime", getCreateTime()) | ||
| 195 | + .append("createBy", getCreateBy()) | ||
| 196 | + .append("updateTime", getUpdateTime()) | ||
| 197 | + .append("updateBy", getUpdateBy()) | ||
| 198 | + .toString(); | ||
| 199 | + } | ||
| 200 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/vo/ConferenceVo.java
0 → 100644
| 1 | +package com.trash.office.domain.vo; | ||
| 2 | + | ||
| 3 | +import com.trash.office.domain.Conference; | ||
| 4 | +import com.trash.office.domain.ContractManagement; | ||
| 5 | +import com.trash.office.domain.UploadFile; | ||
| 6 | + | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 合同管理Vo | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + */ | ||
| 14 | +public class ConferenceVo { | ||
| 15 | + private Conference conference; | ||
| 16 | + | ||
| 17 | + private List<UploadFile> uploadFiles; | ||
| 18 | + | ||
| 19 | + public List<UploadFile> getUploadFiles() { | ||
| 20 | + return uploadFiles; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + public void setUploadFiles(List<UploadFile> uploadFiles) { | ||
| 24 | + this.uploadFiles = uploadFiles; | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | + public Conference getConference() { | ||
| 28 | + return conference; | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + public void setConference(Conference Conference) { | ||
| 32 | + this.conference = Conference; | ||
| 33 | + } | ||
| 34 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/vo/ContractManagementVo.java
| @@ -6,6 +6,11 @@ import com.trash.office.domain.UploadFile; | @@ -6,6 +6,11 @@ import com.trash.office.domain.UploadFile; | ||
| 6 | import java.util.List; | 6 | import java.util.List; |
| 7 | import java.util.Map; | 7 | import java.util.Map; |
| 8 | 8 | ||
| 9 | +/** | ||
| 10 | + * 合同管理Vo | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + */ | ||
| 9 | public class ContractManagementVo { | 14 | public class ContractManagementVo { |
| 10 | private ContractManagement contractManagement; | 15 | private ContractManagement contractManagement; |
| 11 | 16 |
trash-workFlow/src/main/java/com/trash/office/domain/vo/HandleAffairsVo.java
0 → 100644
| 1 | +package com.trash.office.domain.vo; | ||
| 2 | + | ||
| 3 | +import com.trash.office.domain.Conference; | ||
| 4 | +import com.trash.office.domain.HandleAffairs; | ||
| 5 | +import com.trash.office.domain.UploadFile; | ||
| 6 | + | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 合同管理Vo | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + */ | ||
| 14 | +public class HandleAffairsVo { | ||
| 15 | + private HandleAffairs handleAffairs; | ||
| 16 | + | ||
| 17 | + private List<UploadFile> uploadFiles; | ||
| 18 | + | ||
| 19 | + public List<UploadFile> getUploadFiles() { | ||
| 20 | + return uploadFiles; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + public void setUploadFiles(List<UploadFile> uploadFiles) { | ||
| 24 | + this.uploadFiles = uploadFiles; | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | + public HandleAffairs getHandleAffairs() { | ||
| 28 | + return handleAffairs; | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + public void setHandleAffairs(HandleAffairs handleAffairs) { | ||
| 32 | + this.handleAffairs = handleAffairs; | ||
| 33 | + } | ||
| 34 | +} |
trash-workFlow/src/main/java/com/trash/office/domain/vo/LeaveApplicationVo.java
0 → 100644
| 1 | +package com.trash.office.domain.vo; | ||
| 2 | + | ||
| 3 | +import com.trash.office.domain.Conference; | ||
| 4 | +import com.trash.office.domain.LeaveApplication; | ||
| 5 | +import com.trash.office.domain.UploadFile; | ||
| 6 | + | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 请假申请Vo | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + */ | ||
| 14 | +public class LeaveApplicationVo { | ||
| 15 | + private LeaveApplication leaveApplication; | ||
| 16 | + | ||
| 17 | + private List<UploadFile> uploadFiles; | ||
| 18 | + | ||
| 19 | + public List<UploadFile> getUploadFiles() { | ||
| 20 | + return uploadFiles; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + public void setUploadFiles(List<UploadFile> uploadFiles) { | ||
| 24 | + this.uploadFiles = uploadFiles; | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | + public LeaveApplication getLeaveApplication() { | ||
| 28 | + return leaveApplication; | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + public void setLeaveApplication(LeaveApplication leaveApplication) { | ||
| 32 | + this.leaveApplication = leaveApplication; | ||
| 33 | + } | ||
| 34 | +} |
trash-workFlow/src/main/java/com/trash/office/listener/ConferenceListener.java
0 → 100644
| 1 | +package com.trash.office.listener; | ||
| 2 | + | ||
| 3 | +import com.trash.common.utils.spring.SpringUtils; | ||
| 4 | +import com.trash.office.domain.Conference; | ||
| 5 | +import com.trash.office.mapper.ConferenceMapper; | ||
| 6 | +import org.activiti.engine.delegate.DelegateExecution; | ||
| 7 | +import org.activiti.engine.delegate.ExecutionListener; | ||
| 8 | + | ||
| 9 | +public class ConferenceListener implements ExecutionListener { | ||
| 10 | + public String status; | ||
| 11 | + @Override | ||
| 12 | + public void notify(DelegateExecution delegateExecution) { | ||
| 13 | + Conference conference = new Conference(); | ||
| 14 | + conference.setId(Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1])); | ||
| 15 | + conference.setStatus(Integer.parseInt(delegateExecution.getVariable("state").toString())); | ||
| 16 | + SpringUtils.getBean(ConferenceMapper.class).updateConference(conference); | ||
| 17 | + } | ||
| 18 | + | ||
| 19 | +} |
trash-workFlow/src/main/java/com/trash/office/listener/leaveEndListener.java
0 → 100644
| 1 | +package com.trash.office.listener; | ||
| 2 | + | ||
| 3 | +import com.trash.common.utils.spring.SpringUtils; | ||
| 4 | +import com.trash.office.domain.Conference; | ||
| 5 | +import com.trash.office.domain.LeaveApplication; | ||
| 6 | +import com.trash.office.domain.UploadFile; | ||
| 7 | +import com.trash.office.mapper.ConferenceMapper; | ||
| 8 | +import com.trash.office.mapper.LeaveApplicationMapper; | ||
| 9 | +import com.trash.office.mapper.UploadFileMapper; | ||
| 10 | +import org.activiti.engine.delegate.DelegateExecution; | ||
| 11 | +import org.activiti.engine.delegate.ExecutionListener; | ||
| 12 | +import org.activiti.engine.delegate.Expression; | ||
| 13 | +import org.springframework.security.core.parameters.P; | ||
| 14 | + | ||
| 15 | +import javax.swing.*; | ||
| 16 | +import java.util.List; | ||
| 17 | + | ||
| 18 | + | ||
| 19 | +public class leaveEndListener implements ExecutionListener { | ||
| 20 | + private Expression state; | ||
| 21 | + | ||
| 22 | + @Override | ||
| 23 | + public void notify(DelegateExecution delegateExecution) { | ||
| 24 | + String status = (String) state.getValue(delegateExecution); | ||
| 25 | + LeaveApplicationMapper leaveApplicationMapper = SpringUtils.getBean(LeaveApplicationMapper.class); | ||
| 26 | + //判断驳回还是通过 1：通过 2：驳回 | ||
| 27 | + if("1".equals(status)){ | ||
| 28 | + //获取请假申请id | ||
| 29 | + Long id = Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]); | ||
| 30 | + //根据id查出当前请假申请 | ||
| 31 | + LeaveApplication leaveApplication = leaveApplicationMapper.selectLeaveApplicationById(id); | ||
| 32 | + //设置为通过状态 | ||
| 33 | + leaveApplication.setStatus(1); | ||
| 34 | + //添加请假申请（通过状态） | ||
| 35 | + leaveApplicationMapper.updateLeaveApplication(leaveApplication); | ||
| 36 | + }else if("2".equals(status)){ | ||
| 37 | + //获取请假申请id | ||
| 38 | + Long id = Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]); | ||
| 39 | + //根据id查出当前请假申请 | ||
| 40 | + LeaveApplication leaveApplication = leaveApplicationMapper.selectLeaveApplicationById(id); | ||
| 41 | + //设置为驳回状态 | ||
| 42 | + leaveApplication.setStatus(2); | ||
| 43 | + //删除当前请假申请 | ||
| 44 | + leaveApplicationMapper.deleteLeaveApplicationById(id); | ||
| 45 | + | ||
| 46 | + //获取上传文件 | ||
| 47 | + UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class); | ||
| 48 | + //查出旧的文件上传数据 | ||
| 49 | + UploadFile uploadFile = new UploadFile(); | ||
| 50 | + uploadFile.setTableName("leave_application"); | ||
| 51 | + uploadFile.setTableNumber(id.toString()); | ||
| 52 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 53 | + //添加请假申请（驳回状态） | ||
| 54 | + leaveApplicationMapper.insertLeaveApplication(leaveApplication); | ||
| 55 | + for (UploadFile uploadFile1 : list) { | ||
| 56 | + //将上传文件的表id 设置为新的请假申请id | ||
| 57 | + uploadFile1.setTableNumber(leaveApplication.getId().toString()); | ||
| 58 | + uploadFileMapper.updateUploadFile(uploadFile1); | ||
| 59 | + } | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | +} |
trash-workFlow/src/main/java/com/trash/office/mapper/ConferenceMapper.java
0 → 100644
| 1 | +package com.trash.office.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import com.trash.office.domain.Conference; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * 会议管理Mapper接口 | ||
| 8 | + * | ||
| 9 | + * @author 2c | ||
| 10 | + * @date 2023-05-04 | ||
| 11 | + */ | ||
| 12 | +public interface ConferenceMapper | ||
| 13 | +{ | ||
| 14 | + /** | ||
| 15 | + * 查询会议管理 | ||
| 16 | + * | ||
| 17 | + * @param id 会议管理ID | ||
| 18 | + * @return 会议管理 | ||
| 19 | + */ | ||
| 20 | + Conference selectConferenceById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询会议管理列表 | ||
| 24 | + * | ||
| 25 | + * @param conference 会议管理 | ||
| 26 | + * @return 会议管理集合 | ||
| 27 | + */ | ||
| 28 | + List<Conference> selectConferenceList(Conference conference); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增会议管理 | ||
| 32 | + * | ||
| 33 | + * @param conference 会议管理 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertConference(Conference conference); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改会议管理 | ||
| 40 | + * | ||
| 41 | + * @param conference 会议管理 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateConference(Conference conference); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除会议管理 | ||
| 48 | + * | ||
| 49 | + * @param id 会议管理ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteConferenceById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除会议管理 | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteConferenceByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/office/mapper/ContractManagementMapper.java
| @@ -17,7 +17,7 @@ public interface ContractManagementMapper | @@ -17,7 +17,7 @@ public interface ContractManagementMapper | ||
| 17 | * @param id 合同管理ID | 17 | * @param id 合同管理ID |
| 18 | * @return 合同管理 | 18 | * @return 合同管理 |
| 19 | */ | 19 | */ |
| 20 | - public ContractManagement selectContractManagementById(Long id); | 20 | + ContractManagement selectContractManagementById(Long id); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询合同管理列表 | 23 | * 查询合同管理列表 |
| @@ -25,7 +25,7 @@ public interface ContractManagementMapper | @@ -25,7 +25,7 @@ public interface ContractManagementMapper | ||
| 25 | * @param contractManagement 合同管理 | 25 | * @param contractManagement 合同管理 |
| 26 | * @return 合同管理集合 | 26 | * @return 合同管理集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<ContractManagement> selectContractManagementList(ContractManagement contractManagement); | 28 | + List<ContractManagement> selectContractManagementList(ContractManagement contractManagement); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增合同管理 | 31 | * 新增合同管理 |
| @@ -33,7 +33,7 @@ public interface ContractManagementMapper | @@ -33,7 +33,7 @@ public interface ContractManagementMapper | ||
| 33 | * @param contractManagement 合同管理 | 33 | * @param contractManagement 合同管理 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertContractManagement(ContractManagement contractManagement); | 36 | + int insertContractManagement(ContractManagement contractManagement); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改合同管理 | 39 | * 修改合同管理 |
| @@ -41,7 +41,7 @@ public interface ContractManagementMapper | @@ -41,7 +41,7 @@ public interface ContractManagementMapper | ||
| 41 | * @param contractManagement 合同管理 | 41 | * @param contractManagement 合同管理 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateContractManagement(ContractManagement contractManagement); | 44 | + int updateContractManagement(ContractManagement contractManagement); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 删除合同管理 | 47 | * 删除合同管理 |
| @@ -49,7 +49,7 @@ public interface ContractManagementMapper | @@ -49,7 +49,7 @@ public interface ContractManagementMapper | ||
| 49 | * @param id 合同管理ID | 49 | * @param id 合同管理ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteContractManagementById(Long id); | 52 | + int deleteContractManagementById(Long id); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除合同管理 | 55 | * 批量删除合同管理 |
| @@ -57,5 +57,5 @@ public interface ContractManagementMapper | @@ -57,5 +57,5 @@ public interface ContractManagementMapper | ||
| 57 | * @param ids 需要删除的数据ID | 57 | * @param ids 需要删除的数据ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteContractManagementByIds(Long[] ids); | 60 | + int deleteContractManagementByIds(Long[] ids); |
| 61 | } | 61 | } |
trash-workFlow/src/main/java/com/trash/office/mapper/HandleAffairsMapper.java
0 → 100644
| 1 | +package com.trash.office.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | + | ||
| 5 | +import com.trash.office.domain.HandleAffairs; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * 办文办事Mapper接口 | ||
| 9 | + * | ||
| 10 | + * @author 2c | ||
| 11 | + * @date 2023-05-06 | ||
| 12 | + */ | ||
| 13 | +public interface HandleAffairsMapper { | ||
| 14 | + /** | ||
| 15 | + * 查询办文办事 | ||
| 16 | + * | ||
| 17 | + * @param id 办文办事ID | ||
| 18 | + * @return 办文办事 | ||
| 19 | + */ | ||
| 20 | + HandleAffairs selectHandleAffairsById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询办文办事列表 | ||
| 24 | + * | ||
| 25 | + * @param handleAffairs 办文办事 | ||
| 26 | + * @return 办文办事集合 | ||
| 27 | + */ | ||
| 28 | + List<HandleAffairs> selectHandleAffairsList(HandleAffairs handleAffairs); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增办文办事 | ||
| 32 | + * | ||
| 33 | + * @param handleAffairs 办文办事 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertHandleAffairs(HandleAffairs handleAffairs); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改办文办事 | ||
| 40 | + * | ||
| 41 | + * @param handleAffairs 办文办事 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateHandleAffairs(HandleAffairs handleAffairs); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除办文办事 | ||
| 48 | + * | ||
| 49 | + * @param id 办文办事ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteHandleAffairsById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除办文办事 | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteHandleAffairsByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/office/mapper/LeaveApplicationMapper.java
0 → 100644
| 1 | +package com.trash.office.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import com.trash.office.domain.LeaveApplication; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * leaveApplicationMapper接口 | ||
| 8 | + * | ||
| 9 | + * @author 2c | ||
| 10 | + * @date 2023-05-04 | ||
| 11 | + */ | ||
| 12 | +public interface LeaveApplicationMapper | ||
| 13 | +{ | ||
| 14 | + /** | ||
| 15 | + * 查询leaveApplication | ||
| 16 | + * | ||
| 17 | + * @param id leaveApplicationID | ||
| 18 | + * @return leaveApplication | ||
| 19 | + */ | ||
| 20 | + LeaveApplication selectLeaveApplicationById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询leaveApplication列表 | ||
| 24 | + * | ||
| 25 | + * @param leaveApplication leaveApplication | ||
| 26 | + * @return leaveApplication集合 | ||
| 27 | + */ | ||
| 28 | + List<LeaveApplication> selectLeaveApplicationList(LeaveApplication leaveApplication); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增leaveApplication | ||
| 32 | + * | ||
| 33 | + * @param leaveApplication leaveApplication | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertLeaveApplication(LeaveApplication leaveApplication); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改leaveApplication | ||
| 40 | + * | ||
| 41 | + * @param leaveApplication leaveApplication | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateLeaveApplication(LeaveApplication leaveApplication); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除leaveApplication | ||
| 48 | + * | ||
| 49 | + * @param id leaveApplicationID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteLeaveApplicationById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除leaveApplication | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteLeaveApplicationByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/office/mapper/LogisticsManagementMapper.java
0 → 100644
| 1 | +package com.trash.office.mapper; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | +import com.trash.office.domain.LogisticsManagement; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * 后勤管理Mapper接口 | ||
| 8 | + * | ||
| 9 | + * @author 2c | ||
| 10 | + * @date 2023-05-08 | ||
| 11 | + */ | ||
| 12 | +public interface LogisticsManagementMapper | ||
| 13 | +{ | ||
| 14 | + /** | ||
| 15 | + * 查询后勤管理 | ||
| 16 | + * | ||
| 17 | + * @param id 后勤管理ID | ||
| 18 | + * @return 后勤管理 | ||
| 19 | + */ | ||
| 20 | + LogisticsManagement selectLogisticsManagementById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询后勤管理列表 | ||
| 24 | + * | ||
| 25 | + * @param logisticsManagement 后勤管理 | ||
| 26 | + * @return 后勤管理集合 | ||
| 27 | + */ | ||
| 28 | + List<LogisticsManagement> selectLogisticsManagementList(LogisticsManagement logisticsManagement); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增后勤管理 | ||
| 32 | + * | ||
| 33 | + * @param logisticsManagement 后勤管理 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertLogisticsManagement(LogisticsManagement logisticsManagement); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改后勤管理 | ||
| 40 | + * | ||
| 41 | + * @param logisticsManagement 后勤管理 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateLogisticsManagement(LogisticsManagement logisticsManagement); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 删除后勤管理 | ||
| 48 | + * | ||
| 49 | + * @param id 后勤管理ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteLogisticsManagementById(Long id); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 批量删除后勤管理 | ||
| 56 | + * | ||
| 57 | + * @param ids 需要删除的数据ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteLogisticsManagementByIds(Long[] ids); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/office/mapper/UploadFileMapper.java
| @@ -6,7 +6,7 @@ import com.trash.office.domain.UploadFile; | @@ -6,7 +6,7 @@ import com.trash.office.domain.UploadFile; | ||
| 6 | /** | 6 | /** |
| 7 | * 文件上传Mapper接口 | 7 | * 文件上传Mapper接口 |
| 8 | * | 8 | * |
| 9 | - * @author 2cTop1 | 9 | + * @author 2c |
| 10 | * @date 2023-04-28 | 10 | * @date 2023-04-28 |
| 11 | */ | 11 | */ |
| 12 | public interface UploadFileMapper | 12 | public interface UploadFileMapper |
| @@ -17,7 +17,7 @@ public interface UploadFileMapper | @@ -17,7 +17,7 @@ public interface UploadFileMapper | ||
| 17 | * @param id 文件上传ID | 17 | * @param id 文件上传ID |
| 18 | * @return 文件上传 | 18 | * @return 文件上传 |
| 19 | */ | 19 | */ |
| 20 | - public UploadFile selectUploadFileById(Long id); | 20 | + UploadFile selectUploadFileById(Long id); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询文件上传列表 | 23 | * 查询文件上传列表 |
| @@ -25,7 +25,7 @@ public interface UploadFileMapper | @@ -25,7 +25,7 @@ public interface UploadFileMapper | ||
| 25 | * @param uploadFile 文件上传 | 25 | * @param uploadFile 文件上传 |
| 26 | * @return 文件上传集合 | 26 | * @return 文件上传集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<UploadFile> selectUploadFileList(UploadFile uploadFile); | 28 | + List<UploadFile> selectUploadFileList(UploadFile uploadFile); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增文件上传 | 31 | * 新增文件上传 |
| @@ -33,7 +33,7 @@ public interface UploadFileMapper | @@ -33,7 +33,7 @@ public interface UploadFileMapper | ||
| 33 | * @param uploadFile 文件上传 | 33 | * @param uploadFile 文件上传 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertUploadFile(UploadFile uploadFile); | 36 | + int insertUploadFile(UploadFile uploadFile); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改文件上传 | 39 | * 修改文件上传 |
| @@ -41,7 +41,7 @@ public interface UploadFileMapper | @@ -41,7 +41,7 @@ public interface UploadFileMapper | ||
| 41 | * @param uploadFile 文件上传 | 41 | * @param uploadFile 文件上传 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateUploadFile(UploadFile uploadFile); | 44 | + int updateUploadFile(UploadFile uploadFile); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 删除文件上传 | 47 | * 删除文件上传 |
| @@ -49,7 +49,7 @@ public interface UploadFileMapper | @@ -49,7 +49,7 @@ public interface UploadFileMapper | ||
| 49 | * @param id 文件上传ID | 49 | * @param id 文件上传ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteUploadFileById(Long id); | 52 | + int deleteUploadFileById(Long id); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 批量删除文件上传 | 55 | * 批量删除文件上传 |
| @@ -57,5 +57,5 @@ public interface UploadFileMapper | @@ -57,5 +57,5 @@ public interface UploadFileMapper | ||
| 57 | * @param ids 需要删除的数据ID | 57 | * @param ids 需要删除的数据ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteUploadFileByIds(Long[] ids); | 60 | + int deleteUploadFileByIds(Long[] ids); |
| 61 | } | 61 | } |
trash-workFlow/src/main/java/com/trash/office/service/IConferenceService.java
0 → 100644
| 1 | +package com.trash.office.service; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import com.trash.office.domain.Conference; | ||
| 6 | +import com.trash.office.domain.vo.ConferenceVo; | ||
| 7 | +import org.springframework.web.multipart.MultipartFile; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 会议管理Service接口 | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + * @date 2023-05-04 | ||
| 14 | + */ | ||
| 15 | +public interface IConferenceService | ||
| 16 | +{ | ||
| 17 | + /** | ||
| 18 | + * 查询会议管理 | ||
| 19 | + * | ||
| 20 | + * @param id 会议管理ID | ||
| 21 | + * @return 会议管理 | ||
| 22 | + */ | ||
| 23 | + ConferenceVo selectConferenceById(Long id); | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 查询会议管理列表 | ||
| 27 | + * | ||
| 28 | + * @param conference 会议管理 | ||
| 29 | + * @return 会议管理集合 | ||
| 30 | + */ | ||
| 31 | + List<Conference> selectConferenceList(Conference conference); | ||
| 32 | + | ||
| 33 | + /** | ||
| 34 | + * 新增会议管理 | ||
| 35 | + * | ||
| 36 | + * @param conference 会议管理 | ||
| 37 | + * @return 结果 | ||
| 38 | + */ | ||
| 39 | + int insertConference(MultipartFile[] files, Conference conference) throws IOException; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 修改会议管理 | ||
| 43 | + * | ||
| 44 | + * @param conference 会议管理 | ||
| 45 | + * @return 结果 | ||
| 46 | + */ | ||
| 47 | + int updateConference(MultipartFile[] files, ConferenceVo conferenceVo) throws IOException; | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 批量删除会议管理 | ||
| 51 | + * | ||
| 52 | + * @param ids 需要删除的会议管理ID | ||
| 53 | + * @return 结果 | ||
| 54 | + */ | ||
| 55 | + int deleteConferenceByIds(Long[] ids); | ||
| 56 | + | ||
| 57 | + /** | ||
| 58 | + * 删除会议管理信息 | ||
| 59 | + * | ||
| 60 | + * @param id 会议管理ID | ||
| 61 | + * @return 结果 | ||
| 62 | + */ | ||
| 63 | + int deleteConferenceById(Long id); | ||
| 64 | +} |
trash-workFlow/src/main/java/com/trash/office/service/IContractManagementService.java
| @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; | @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; | ||
| 9 | /** | 9 | /** |
| 10 | * 合同管理Service接口 | 10 | * 合同管理Service接口 |
| 11 | * | 11 | * |
| 12 | - * @author trash | 12 | + * @author 2c |
| 13 | * @date 2023-04-27 | 13 | * @date 2023-04-27 |
| 14 | */ | 14 | */ |
| 15 | public interface IContractManagementService | 15 | public interface IContractManagementService |
| @@ -20,7 +20,7 @@ public interface IContractManagementService | @@ -20,7 +20,7 @@ public interface IContractManagementService | ||
| 20 | * @param id 合同管理ID | 20 | * @param id 合同管理ID |
| 21 | * @return 合同管理 | 21 | * @return 合同管理 |
| 22 | */ | 22 | */ |
| 23 | - public ContractManagementVo selectContractManagementById(Long id); | 23 | + ContractManagementVo selectContractManagementById(Long id); |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * 查询合同管理列表 | 26 | * 查询合同管理列表 |
| @@ -28,7 +28,7 @@ public interface IContractManagementService | @@ -28,7 +28,7 @@ public interface IContractManagementService | ||
| 28 | * @param contractManagement 合同管理 | 28 | * @param contractManagement 合同管理 |
| 29 | * @return 合同管理集合 | 29 | * @return 合同管理集合 |
| 30 | */ | 30 | */ |
| 31 | - public List<ContractManagement> selectContractManagementList(ContractManagement contractManagement); | 31 | + List<ContractManagement> selectContractManagementList(ContractManagement contractManagement); |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * 新增合同管理 | 34 | * 新增合同管理 |
| @@ -36,7 +36,7 @@ public interface IContractManagementService | @@ -36,7 +36,7 @@ public interface IContractManagementService | ||
| 36 | * @param contractManagement 合同管理 | 36 | * @param contractManagement 合同管理 |
| 37 | * @return 结果 | 37 | * @return 结果 |
| 38 | */ | 38 | */ |
| 39 | - public int insertContractManagement(MultipartFile[] files, ContractManagement contractManagement) throws IOException; | 39 | + int insertContractManagement(MultipartFile[] files, ContractManagement contractManagement) throws IOException; |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 修改合同管理 | 42 | * 修改合同管理 |
| @@ -44,7 +44,7 @@ public interface IContractManagementService | @@ -44,7 +44,7 @@ public interface IContractManagementService | ||
| 44 | * @param contractManagement 合同管理 | 44 | * @param contractManagement 合同管理 |
| 45 | * @return 结果 | 45 | * @return 结果 |
| 46 | */ | 46 | */ |
| 47 | - public int updateContractManagement(MultipartFile[] files,ContractManagementVo contractManagementVo) throws IOException; | 47 | + int updateContractManagement(MultipartFile[] files, ContractManagementVo contractManagementVo) throws IOException; |
| 48 | 48 | ||
| 49 | /** | 49 | /** |
| 50 | * 批量删除合同管理 | 50 | * 批量删除合同管理 |
| @@ -52,7 +52,7 @@ public interface IContractManagementService | @@ -52,7 +52,7 @@ public interface IContractManagementService | ||
| 52 | * @param ids 需要删除的合同管理ID | 52 | * @param ids 需要删除的合同管理ID |
| 53 | * @return 结果 | 53 | * @return 结果 |
| 54 | */ | 54 | */ |
| 55 | - public int deleteContractManagementByIds(Long[] ids) throws IOException; | 55 | + int deleteContractManagementByIds(Long[] ids) throws IOException; |
| 56 | 56 | ||
| 57 | /** | 57 | /** |
| 58 | * 删除合同管理信息 | 58 | * 删除合同管理信息 |
| @@ -60,5 +60,5 @@ public interface IContractManagementService | @@ -60,5 +60,5 @@ public interface IContractManagementService | ||
| 60 | * @param id 合同管理ID | 60 | * @param id 合同管理ID |
| 61 | * @return 结果 | 61 | * @return 结果 |
| 62 | */ | 62 | */ |
| 63 | - public int deleteContractManagementById(Long id); | 63 | + int deleteContractManagementById(Long id) throws IOException; |
| 64 | } | 64 | } |
trash-workFlow/src/main/java/com/trash/office/service/IHandleAffairsService.java
0 → 100644
| 1 | +package com.trash.office.service; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | + | ||
| 6 | +import com.trash.office.domain.HandleAffairs; | ||
| 7 | +import com.trash.office.domain.vo.HandleAffairsVo; | ||
| 8 | +import org.springframework.web.multipart.MultipartFile; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 办文办事Service接口 | ||
| 12 | + * | ||
| 13 | + * @author 2c | ||
| 14 | + * @date 2023-05-06 | ||
| 15 | + */ | ||
| 16 | +public interface IHandleAffairsService { | ||
| 17 | + /** | ||
| 18 | + * 查询办文办事 | ||
| 19 | + * | ||
| 20 | + * @param id 办文办事ID | ||
| 21 | + * @return 办文办事 | ||
| 22 | + */ | ||
| 23 | + HandleAffairsVo selectHandleAffairsById(Long id); | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 查询办文办事列表 | ||
| 27 | + * | ||
| 28 | + * @param handleAffairs 办文办事 | ||
| 29 | + * @return 办文办事集合 | ||
| 30 | + */ | ||
| 31 | + List<HandleAffairs> selectHandleAffairsList(HandleAffairs handleAffairs); | ||
| 32 | + | ||
| 33 | + /** | ||
| 34 | + * 新增办文办事 | ||
| 35 | + * | ||
| 36 | + * @param handleAffairs 办文办事 | ||
| 37 | + * @return 结果 | ||
| 38 | + */ | ||
| 39 | + int insertHandleAffairs(MultipartFile[] files,HandleAffairs handleAffairs) throws IOException; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 修改办文办事 | ||
| 43 | + * | ||
| 44 | + * @param handleAffairs 办文办事 | ||
| 45 | + * @return 结果 | ||
| 46 | + */ | ||
| 47 | + int updateHandleAffairs(MultipartFile[] files,HandleAffairsVo handleAffairsVo) throws IOException; | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 批量删除办文办事 | ||
| 51 | + * | ||
| 52 | + * @param ids 需要删除的办文办事ID | ||
| 53 | + * @return 结果 | ||
| 54 | + */ | ||
| 55 | + int deleteHandleAffairsByIds(Long[] ids); | ||
| 56 | + | ||
| 57 | + /** | ||
| 58 | + * 删除办文办事信息 | ||
| 59 | + * | ||
| 60 | + * @param id 办文办事ID | ||
| 61 | + * @return 结果 | ||
| 62 | + */ | ||
| 63 | + int deleteHandleAffairsById(Long id); | ||
| 64 | +} |
trash-workFlow/src/main/java/com/trash/office/service/ILeaveApplicationService.java
0 → 100644
| 1 | +package com.trash.office.service; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import com.trash.office.domain.LeaveApplication; | ||
| 6 | +import com.trash.office.domain.vo.LeaveApplicationVo; | ||
| 7 | +import org.springframework.web.multipart.MultipartFile; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * leaveApplicationService接口 | ||
| 11 | + * | ||
| 12 | + * @author 2c | ||
| 13 | + * @date 2023-05-04 | ||
| 14 | + */ | ||
| 15 | +public interface ILeaveApplicationService | ||
| 16 | +{ | ||
| 17 | + /** | ||
| 18 | + * 查询leaveApplication | ||
| 19 | + * | ||
| 20 | + * @param id leaveApplicationID | ||
| 21 | + * @return leaveApplication | ||
| 22 | + */ | ||
| 23 | + LeaveApplicationVo selectLeaveApplicationById(Long id); | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 查询leaveApplication列表 | ||
| 27 | + * | ||
| 28 | + * @param leaveApplication leaveApplication | ||
| 29 | + * @return leaveApplication集合 | ||
| 30 | + */ | ||
| 31 | + List<LeaveApplication> selectLeaveApplicationList(LeaveApplication leaveApplication); | ||
| 32 | + | ||
| 33 | + /** | ||
| 34 | + * 新增leaveApplication | ||
| 35 | + * | ||
| 36 | + * @param leaveApplication leaveApplication | ||
| 37 | + * @return 结果 | ||
| 38 | + */ | ||
| 39 | + int insertLeaveApplication(MultipartFile[] files,LeaveApplication leaveApplication) throws IOException; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 修改leaveApplication | ||
| 43 | + * | ||
| 44 | + * @param leaveApplication leaveApplication | ||
| 45 | + * @return 结果 | ||
| 46 | + */ | ||
| 47 | + int updateLeaveApplication(MultipartFile[] files,LeaveApplicationVo leaveApplicationVo) throws IOException; | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 批量删除leaveApplication | ||
| 51 | + * | ||
| 52 | + * @param ids 需要删除的leaveApplicationID | ||
| 53 | + * @return 结果 | ||
| 54 | + */ | ||
| 55 | + int deleteLeaveApplicationByIds(Long[] ids); | ||
| 56 | + | ||
| 57 | + /** | ||
| 58 | + * 删除leaveApplication信息 | ||
| 59 | + * | ||
| 60 | + * @param id leaveApplicationID | ||
| 61 | + * @return 结果 | ||
| 62 | + */ | ||
| 63 | + int deleteLeaveApplicationById(Long id); | ||
| 64 | +} |
trash-workFlow/src/main/java/com/trash/office/service/ILogisticsManagementService.java
0 → 100644
| 1 | +package com.trash.office.service; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | + | ||
| 5 | +import com.trash.office.domain.LogisticsManagement; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * 后勤管理Service接口 | ||
| 9 | + * | ||
| 10 | + * @author 2c | ||
| 11 | + * @date 2023-05-08 | ||
| 12 | + */ | ||
| 13 | +public interface ILogisticsManagementService { | ||
| 14 | + /** | ||
| 15 | + * 查询后勤管理 | ||
| 16 | + * | ||
| 17 | + * @param id 后勤管理ID | ||
| 18 | + * @return 后勤管理 | ||
| 19 | + */ | ||
| 20 | + LogisticsManagement selectLogisticsManagementById(Long id); | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 查询后勤管理列表 | ||
| 24 | + * | ||
| 25 | + * @param logisticsManagement 后勤管理 | ||
| 26 | + * @return 后勤管理集合 | ||
| 27 | + */ | ||
| 28 | + List<LogisticsManagement> selectLogisticsManagementList(LogisticsManagement logisticsManagement); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 新增后勤管理 | ||
| 32 | + * | ||
| 33 | + * @param logisticsManagement 后勤管理 | ||
| 34 | + * @return 结果 | ||
| 35 | + */ | ||
| 36 | + int insertLogisticsManagement(LogisticsManagement logisticsManagement); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 修改后勤管理 | ||
| 40 | + * | ||
| 41 | + * @param logisticsManagement 后勤管理 | ||
| 42 | + * @return 结果 | ||
| 43 | + */ | ||
| 44 | + int updateLogisticsManagement(LogisticsManagement logisticsManagement); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 批量删除后勤管理 | ||
| 48 | + * | ||
| 49 | + * @param ids 需要删除的后勤管理ID | ||
| 50 | + * @return 结果 | ||
| 51 | + */ | ||
| 52 | + int deleteLogisticsManagementByIds(Long[] ids); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 删除后勤管理信息 | ||
| 56 | + * | ||
| 57 | + * @param id 后勤管理ID | ||
| 58 | + * @return 结果 | ||
| 59 | + */ | ||
| 60 | + int deleteLogisticsManagementById(Long id); | ||
| 61 | +} |
trash-workFlow/src/main/java/com/trash/office/service/IUploadFileService.java
| @@ -17,7 +17,7 @@ public interface IUploadFileService | @@ -17,7 +17,7 @@ public interface IUploadFileService | ||
| 17 | * @param id 文件上传ID | 17 | * @param id 文件上传ID |
| 18 | * @return 文件上传 | 18 | * @return 文件上传 |
| 19 | */ | 19 | */ |
| 20 | - public UploadFile selectUploadFileById(Long id); | 20 | + UploadFile selectUploadFileById(Long id); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 查询文件上传列表 | 23 | * 查询文件上传列表 |
| @@ -25,7 +25,7 @@ public interface IUploadFileService | @@ -25,7 +25,7 @@ public interface IUploadFileService | ||
| 25 | * @param uploadFile 文件上传 | 25 | * @param uploadFile 文件上传 |
| 26 | * @return 文件上传集合 | 26 | * @return 文件上传集合 |
| 27 | */ | 27 | */ |
| 28 | - public List<UploadFile> selectUploadFileList(UploadFile uploadFile); | 28 | + List<UploadFile> selectUploadFileList(UploadFile uploadFile); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 新增文件上传 | 31 | * 新增文件上传 |
| @@ -33,7 +33,7 @@ public interface IUploadFileService | @@ -33,7 +33,7 @@ public interface IUploadFileService | ||
| 33 | * @param uploadFile 文件上传 | 33 | * @param uploadFile 文件上传 |
| 34 | * @return 结果 | 34 | * @return 结果 |
| 35 | */ | 35 | */ |
| 36 | - public int insertUploadFile(UploadFile uploadFile); | 36 | + int insertUploadFile(UploadFile uploadFile); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * 修改文件上传 | 39 | * 修改文件上传 |
| @@ -41,7 +41,7 @@ public interface IUploadFileService | @@ -41,7 +41,7 @@ public interface IUploadFileService | ||
| 41 | * @param uploadFile 文件上传 | 41 | * @param uploadFile 文件上传 |
| 42 | * @return 结果 | 42 | * @return 结果 |
| 43 | */ | 43 | */ |
| 44 | - public int updateUploadFile(UploadFile uploadFile); | 44 | + int updateUploadFile(UploadFile uploadFile); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 批量删除文件上传 | 47 | * 批量删除文件上传 |
| @@ -49,7 +49,7 @@ public interface IUploadFileService | @@ -49,7 +49,7 @@ public interface IUploadFileService | ||
| 49 | * @param ids 需要删除的文件上传ID | 49 | * @param ids 需要删除的文件上传ID |
| 50 | * @return 结果 | 50 | * @return 结果 |
| 51 | */ | 51 | */ |
| 52 | - public int deleteUploadFileByIds(Long[] ids); | 52 | + int deleteUploadFileByIds(Long[] ids); |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 删除文件上传信息 | 55 | * 删除文件上传信息 |
| @@ -57,5 +57,13 @@ public interface IUploadFileService | @@ -57,5 +57,13 @@ public interface IUploadFileService | ||
| 57 | * @param id 文件上传ID | 57 | * @param id 文件上传ID |
| 58 | * @return 结果 | 58 | * @return 结果 |
| 59 | */ | 59 | */ |
| 60 | - public int deleteUploadFileById(Long id); | 60 | + int deleteUploadFileById(Long id); |
| 61 | + | ||
| 62 | + /** | ||
| 63 | + * 根据文件名和编号查询文件上传列表 | ||
| 64 | + * @param name | ||
| 65 | + * @param number | ||
| 66 | + * @return | ||
| 67 | + */ | ||
| 68 | + List<UploadFile> selectUploadFileListByNameAndNumber(String name,String number); | ||
| 61 | } | 69 | } |
trash-workFlow/src/main/java/com/trash/office/service/impl/ConferenceServiceImpl.java
0 → 100644
| 1 | +package com.trash.office.service.impl; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import java.util.stream.Collectors; | ||
| 6 | + | ||
| 7 | +import com.trash.common.utils.DateUtils; | ||
| 8 | +import com.trash.common.utils.SecurityUtils; | ||
| 9 | +import com.trash.common.utils.file.FileUploadUtils; | ||
| 10 | +import com.trash.common.utils.uuid.UUID; | ||
| 11 | +import com.trash.office.domain.ContractManagement; | ||
| 12 | +import com.trash.office.domain.UploadFile; | ||
| 13 | +import com.trash.office.domain.vo.ConferenceVo; | ||
| 14 | +import com.trash.office.domain.vo.ContractManagementVo; | ||
| 15 | +import com.trash.office.mapper.UploadFileMapper; | ||
| 16 | +import com.trash.workflow.domain.Workflow; | ||
| 17 | +import com.trash.workflow.mapper.WorkflowMapper; | ||
| 18 | +import org.activiti.api.process.model.ProcessInstance; | ||
| 19 | +import org.activiti.api.process.model.builders.ProcessPayloadBuilder; | ||
| 20 | +import org.activiti.api.process.runtime.ProcessRuntime; | ||
| 21 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 22 | +import org.springframework.stereotype.Service; | ||
| 23 | +import com.trash.office.mapper.ConferenceMapper; | ||
| 24 | +import com.trash.office.domain.Conference; | ||
| 25 | +import com.trash.office.service.IConferenceService; | ||
| 26 | +import org.springframework.transaction.annotation.Transactional; | ||
| 27 | +import org.springframework.transaction.interceptor.TransactionAspectSupport; | ||
| 28 | +import org.springframework.web.multipart.MultipartFile; | ||
| 29 | + | ||
| 30 | +/** | ||
| 31 | + * 会议管理Service业务层处理 | ||
| 32 | + * | ||
| 33 | + * @author 2c | ||
| 34 | + * @date 2023-05-04 | ||
| 35 | + */ | ||
| 36 | +@Service | ||
| 37 | +public class ConferenceServiceImpl implements IConferenceService { | ||
| 38 | + @Autowired | ||
| 39 | + private ConferenceMapper conferenceMapper; | ||
| 40 | + | ||
| 41 | + @Autowired | ||
| 42 | + private UploadFileMapper uploadFileMapper; | ||
| 43 | + | ||
| 44 | + @Autowired | ||
| 45 | + private ProcessRuntime processRuntime; | ||
| 46 | + | ||
| 47 | + @Autowired | ||
| 48 | + private WorkflowMapper workflowMapper; | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 查询会议管理 | ||
| 52 | + * | ||
| 53 | + * @param id 会议管理ID | ||
| 54 | + * @return 会议管理 | ||
| 55 | + */ | ||
| 56 | + @Override | ||
| 57 | + public ConferenceVo selectConferenceById(Long id) { | ||
| 58 | + ConferenceVo ConferenceVo = new ConferenceVo(); | ||
| 59 | + ConferenceVo.setConference(conferenceMapper.selectConferenceById(id)); | ||
| 60 | + UploadFile uploadFile = new UploadFile(); | ||
| 61 | + uploadFile.setTableName("conferrnce"); | ||
| 62 | + uploadFile.setTableNumber(ConferenceVo.getConference().getId().toString()); | ||
| 63 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 64 | + ConferenceVo.setUploadFiles(list); | ||
| 65 | + return ConferenceVo; | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | + /** | ||
| 69 | + * 查询会议管理列表 | ||
| 70 | + * | ||
| 71 | + * @param conference 会议管理 | ||
| 72 | + * @return 会议管理 | ||
| 73 | + */ | ||
| 74 | + @Override | ||
| 75 | + public List<Conference> selectConferenceList(Conference conference) { | ||
| 76 | + return conferenceMapper.selectConferenceList(conference); | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + /** | ||
| 80 | + * 新增会议管理 | ||
| 81 | + * | ||
| 82 | + * @param conference 会议管理 | ||
| 83 | + * @return 结果 | ||
| 84 | + */ | ||
| 85 | + @Override | ||
| 86 | + @Transactional | ||
| 87 | + public int insertConference(MultipartFile[] files, Conference conference) throws IOException { | ||
| 88 | + //新增会议管理 | ||
| 89 | + conference.setCreateBy(SecurityUtils.getUsername()); | ||
| 90 | + conference.setStatus(0); | ||
| 91 | + Integer result = conferenceMapper.insertConference(conference); | ||
| 92 | + //新增工作台数据 | ||
| 93 | + Workflow workflow = new Workflow(); | ||
| 94 | + workflow.setId("conference:" + conference.getId()); | ||
| 95 | + workflow.setTitle("会议管理:" + conference.getConferenceSite()); | ||
| 96 | + workflow.setType("会议管理"); | ||
| 97 | + workflow.setReason("会议管理"); | ||
| 98 | + workflow.setState("0"); | ||
| 99 | + //发起流程 | ||
| 100 | + ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder | ||
| 101 | + .start() | ||
| 102 | + .withProcessDefinitionKey("conference") | ||
| 103 | + .withName("会议申请:" + conference.getId()) | ||
| 104 | + .withBusinessKey("conference:" + conference.getId()) | ||
| 105 | + .build()); | ||
| 106 | + workflow.setInstanceId(processInstance.getId()); | ||
| 107 | + workflowMapper.insertWorkflow(workflow); | ||
| 108 | + //文件上传 | ||
| 109 | + for (MultipartFile file : files) { | ||
| 110 | + UploadFile uploadFile = new UploadFile(); | ||
| 111 | + uploadFile.setTableName("conferrnce"); | ||
| 112 | + uploadFile.setTableNumber(conference.getId().toString()); | ||
| 113 | + uploadFile.setFileName(file.getOriginalFilename()); | ||
| 114 | + uploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 115 | + uploadFileMapper.insertUploadFile(uploadFile); | ||
| 116 | + } | ||
| 117 | + return result; | ||
| 118 | + } | ||
| 119 | + | ||
| 120 | + /** | ||
| 121 | + * 修改会议管理 | ||
| 122 | + * | ||
| 123 | + * @param conferenceVo 会议管理 | ||
| 124 | + * @return 结果 | ||
| 125 | + */ | ||
| 126 | + @Override | ||
| 127 | + @Transactional | ||
| 128 | + public int updateConference(MultipartFile[] files, ConferenceVo conferenceVo) throws IOException { | ||
| 129 | + conferenceVo.getConference().setUpdateBy(SecurityUtils.getUsername()); | ||
| 130 | + //查询该合同下的文件上传数据然后删除数据库中的数据和文件 | ||
| 131 | + UploadFile uploadFile = new UploadFile(); | ||
| 132 | + uploadFile.setTableName("conferrnce"); | ||
| 133 | + uploadFile.setTableNumber(conferenceVo.getConference().getId().toString()); | ||
| 134 | + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 135 | + //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件 | ||
| 136 | + if (conferenceVo.getUploadFiles().size() != 0) { | ||
| 137 | + //获取两个list的交集 | ||
| 138 | + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> conferenceVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList()); | ||
| 139 | + //去掉交集得到需要删除的数据 | ||
| 140 | + uploadFileList.removeAll(distinctList); | ||
| 141 | + | ||
| 142 | + for (UploadFile distinctFile : uploadFileList) { | ||
| 143 | + uploadFileMapper.deleteUploadFileById(distinctFile.getId()); | ||
| 144 | + //删除文件 | ||
| 145 | + FileUploadUtils.deleteFile(distinctFile.getFilePath()); | ||
| 146 | + } | ||
| 147 | + } else { | ||
| 148 | + for (UploadFile uploadFile1 : uploadFileList) { | ||
| 149 | + //删除数据库数据 | ||
| 150 | + uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); | ||
| 151 | + //删除文件 | ||
| 152 | + FileUploadUtils.deleteFile(uploadFile1.getFilePath()); | ||
| 153 | + } | ||
| 154 | + } | ||
| 155 | + | ||
| 156 | + //添加新的文件 | ||
| 157 | + for (MultipartFile file : files) { | ||
| 158 | + UploadFile newUploadFile = new UploadFile(); | ||
| 159 | + newUploadFile.setTableName("conferrnce"); | ||
| 160 | + newUploadFile.setTableNumber(conferenceVo.getConference().getId().toString()); | ||
| 161 | + newUploadFile.setFileName(file.getOriginalFilename()); | ||
| 162 | + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 163 | + uploadFileMapper.insertUploadFile(newUploadFile); | ||
| 164 | + } | ||
| 165 | + return conferenceMapper.updateConference(conferenceVo.getConference()); | ||
| 166 | + } | ||
| 167 | + | ||
| 168 | + /** | ||
| 169 | + * 批量删除会议管理 | ||
| 170 | + * | ||
| 171 | + * @param ids 需要删除的会议管理ID | ||
| 172 | + * @return 结果 | ||
| 173 | + */ | ||
| 174 | + @Override | ||
| 175 | + @Transactional | ||
| 176 | + public int deleteConferenceByIds(Long[] ids) { | ||
| 177 | + for (Long id : ids) { | ||
| 178 | + Conference conference = conferenceMapper.selectConferenceById(id); | ||
| 179 | + UploadFile uploadFile = new UploadFile(); | ||
| 180 | + uploadFile.setTableName("conferrnce"); | ||
| 181 | + uploadFile.setTableNumber(conference.getId().toString()); | ||
| 182 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 183 | + //遍历删除文件 | ||
| 184 | + for (UploadFile file : list) { | ||
| 185 | + uploadFileMapper.deleteUploadFileById(file.getId()); | ||
| 186 | + FileUploadUtils.deleteFile(file.getFilePath()); | ||
| 187 | + } | ||
| 188 | + } | ||
| 189 | + return conferenceMapper.deleteConferenceByIds(ids); | ||
| 190 | + } | ||
| 191 | + | ||
| 192 | + /** | ||
| 193 | + * 删除会议管理信息 | ||
| 194 | + * | ||
| 195 | + * @param id 会议管理ID | ||
| 196 | + * @return 结果 | ||
| 197 | + */ | ||
| 198 | + @Override | ||
| 199 | + public int deleteConferenceById(Long id) { | ||
| 200 | + return conferenceMapper.deleteConferenceById(id); | ||
| 201 | + } | ||
| 202 | +} |
trash-workFlow/src/main/java/com/trash/office/service/impl/ContractManagementServiceImpl.java
| @@ -7,6 +7,8 @@ import java.util.stream.Collectors; | @@ -7,6 +7,8 @@ import java.util.stream.Collectors; | ||
| 7 | import java.util.stream.Stream; | 7 | import java.util.stream.Stream; |
| 8 | 8 | ||
| 9 | import com.trash.common.config.trashConfig; | 9 | import com.trash.common.config.trashConfig; |
| 10 | +import com.trash.common.utils.DateUtils; | ||
| 11 | +import com.trash.common.utils.SecurityUtils; | ||
| 10 | import com.trash.common.utils.file.FileUploadUtils; | 12 | import com.trash.common.utils.file.FileUploadUtils; |
| 11 | import com.trash.framework.config.ServerConfig; | 13 | import com.trash.framework.config.ServerConfig; |
| 12 | import com.trash.office.domain.UploadFile; | 14 | import com.trash.office.domain.UploadFile; |
| @@ -20,10 +22,12 @@ import com.trash.office.service.IContractManagementService; | @@ -20,10 +22,12 @@ import com.trash.office.service.IContractManagementService; | ||
| 20 | import org.springframework.transaction.annotation.Transactional; | 22 | import org.springframework.transaction.annotation.Transactional; |
| 21 | import org.springframework.web.multipart.MultipartFile; | 23 | import org.springframework.web.multipart.MultipartFile; |
| 22 | 24 | ||
| 25 | +import javax.security.auth.Subject; | ||
| 26 | + | ||
| 23 | /** | 27 | /** |
| 24 | * 合同管理Service业务层处理 | 28 | * 合同管理Service业务层处理 |
| 25 | * | 29 | * |
| 26 | - * @author trash | 30 | + * @author 2c |
| 27 | * @date 2023-04-27 | 31 | * @date 2023-04-27 |
| 28 | */ | 32 | */ |
| 29 | @Service | 33 | @Service |
| @@ -74,12 +78,14 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -74,12 +78,14 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 74 | @Override | 78 | @Override |
| 75 | @Transactional | 79 | @Transactional |
| 76 | public int insertContractManagement(MultipartFile[] files, ContractManagement contractManagement) throws IOException { | 80 | public int insertContractManagement(MultipartFile[] files, ContractManagement contractManagement) throws IOException { |
| 81 | + contractManagement.setStatus(0); | ||
| 82 | + contractManagement.setCreateBy(SecurityUtils.getUsername()); | ||
| 77 | for(MultipartFile file:files) { | 83 | for(MultipartFile file:files) { |
| 78 | UploadFile uploadFile = new UploadFile(); | 84 | UploadFile uploadFile = new UploadFile(); |
| 79 | uploadFile.setTableName("contract_management"); | 85 | uploadFile.setTableName("contract_management"); |
| 80 | uploadFile.setTableNumber(contractManagement.getContractNumber()); | 86 | uploadFile.setTableNumber(contractManagement.getContractNumber()); |
| 81 | uploadFile.setFileName(file.getOriginalFilename()); | 87 | uploadFile.setFileName(file.getOriginalFilename()); |
| 82 | - uploadFile.setFilePath(uploadFile(file)); | 88 | + uploadFile.setFilePath(FileUploadUtils.uploadFile(file)); |
| 83 | uploadFileMapper.insertUploadFile(uploadFile); | 89 | uploadFileMapper.insertUploadFile(uploadFile); |
| 84 | } | 90 | } |
| 85 | return contractManagementMapper.insertContractManagement(contractManagement); | 91 | return contractManagementMapper.insertContractManagement(contractManagement); |
| @@ -92,7 +98,9 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -92,7 +98,9 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 92 | * @return 结果 | 98 | * @return 结果 |
| 93 | */ | 99 | */ |
| 94 | @Override | 100 | @Override |
| 101 | + @Transactional | ||
| 95 | public int updateContractManagement(MultipartFile[] files,ContractManagementVo contractManagementVo) throws IOException { | 102 | public int updateContractManagement(MultipartFile[] files,ContractManagementVo contractManagementVo) throws IOException { |
| 103 | + contractManagementVo.getContractManagement().setUpdateBy(SecurityUtils.getUsername()); | ||
| 96 | //查询该合同下的文件上传数据然后删除数据库中的数据和文件 | 104 | //查询该合同下的文件上传数据然后删除数据库中的数据和文件 |
| 97 | UploadFile uploadFile = new UploadFile(); | 105 | UploadFile uploadFile = new UploadFile(); |
| 98 | uploadFile.setTableName("contract_management"); | 106 | uploadFile.setTableName("contract_management"); |
| @@ -108,14 +116,14 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -108,14 +116,14 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 108 | for (UploadFile distinctFile:uploadFileList){ | 116 | for (UploadFile distinctFile:uploadFileList){ |
| 109 | uploadFileMapper.deleteUploadFileById(distinctFile.getId()); | 117 | uploadFileMapper.deleteUploadFileById(distinctFile.getId()); |
| 110 | //删除文件 | 118 | //删除文件 |
| 111 | - deleteFile(distinctFile.getFilePath()); | 119 | + FileUploadUtils.deleteFile(distinctFile.getFilePath()); |
| 112 | } | 120 | } |
| 113 | }else{ | 121 | }else{ |
| 114 | for(UploadFile uploadFile1:uploadFileList){ | 122 | for(UploadFile uploadFile1:uploadFileList){ |
| 115 | //删除数据库数据 | 123 | //删除数据库数据 |
| 116 | uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); | 124 | uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); |
| 117 | //删除文件 | 125 | //删除文件 |
| 118 | - deleteFile(uploadFile1.getFilePath()); | 126 | + FileUploadUtils.deleteFile(uploadFile1.getFilePath()); |
| 119 | } | 127 | } |
| 120 | } | 128 | } |
| 121 | 129 | ||
| @@ -125,7 +133,7 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -125,7 +133,7 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 125 | newUploadFile.setTableName("contract_management"); | 133 | newUploadFile.setTableName("contract_management"); |
| 126 | newUploadFile.setTableNumber(contractManagementVo.getContractManagement().getContractNumber()); | 134 | newUploadFile.setTableNumber(contractManagementVo.getContractManagement().getContractNumber()); |
| 127 | newUploadFile.setFileName(file.getOriginalFilename()); | 135 | newUploadFile.setFileName(file.getOriginalFilename()); |
| 128 | - newUploadFile.setFilePath(uploadFile(file)); | 136 | + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file)); |
| 129 | uploadFileMapper.insertUploadFile(newUploadFile); | 137 | uploadFileMapper.insertUploadFile(newUploadFile); |
| 130 | } | 138 | } |
| 131 | 139 | ||
| @@ -139,15 +147,17 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -139,15 +147,17 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 139 | * @return 结果 | 147 | * @return 结果 |
| 140 | */ | 148 | */ |
| 141 | @Override | 149 | @Override |
| 142 | - public int deleteContractManagementByIds(Long[] ids) throws IOException { | 150 | + @Transactional |
| 151 | + public int deleteContractManagementByIds(Long[] ids) { | ||
| 143 | for(Long id:ids){ | 152 | for(Long id:ids){ |
| 144 | ContractManagement contractManagement = contractManagementMapper.selectContractManagementById(id); | 153 | ContractManagement contractManagement = contractManagementMapper.selectContractManagementById(id); |
| 145 | UploadFile uploadFile = new UploadFile(); | 154 | UploadFile uploadFile = new UploadFile(); |
| 146 | uploadFile.setTableNumber(contractManagement.getContractNumber()); | 155 | uploadFile.setTableNumber(contractManagement.getContractNumber()); |
| 147 | List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | 156 | List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); |
| 157 | + //遍历删除文件 | ||
| 148 | for (UploadFile file : list) { | 158 | for (UploadFile file : list) { |
| 149 | uploadFileMapper.deleteUploadFileById(file.getId()); | 159 | uploadFileMapper.deleteUploadFileById(file.getId()); |
| 150 | - deleteFile(file.getFilePath()); | 160 | + FileUploadUtils.deleteFile(file.getFilePath()); |
| 151 | } | 161 | } |
| 152 | } | 162 | } |
| 153 | return contractManagementMapper.deleteContractManagementByIds(ids); | 163 | return contractManagementMapper.deleteContractManagementByIds(ids); |
| @@ -166,31 +176,10 @@ public class ContractManagementServiceImpl implements IContractManagementService | @@ -166,31 +176,10 @@ public class ContractManagementServiceImpl implements IContractManagementService | ||
| 166 | UploadFile uploadFile = new UploadFile(); | 176 | UploadFile uploadFile = new UploadFile(); |
| 167 | uploadFile.setTableNumber(contractManagement.getContractNumber()); | 177 | uploadFile.setTableNumber(contractManagement.getContractNumber()); |
| 168 | List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | 178 | List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); |
| 169 | - list.stream().forEach(file -> { | 179 | + for (UploadFile file : list) { |
| 170 | uploadFileMapper.deleteUploadFileById(file.getId()); | 180 | uploadFileMapper.deleteUploadFileById(file.getId()); |
| 171 | - String filePath = file.getFilePath(); | ||
| 172 | - filePath = filePath.substring(filePath.indexOf("/profile")+8,filePath.length()); | ||
| 173 | - FileUploadUtils.deleteFile(filePath); | ||
| 174 | - }); | 181 | + FileUploadUtils.deleteFile(file.getFilePath()); |
| 182 | + } | ||
| 175 | return contractManagementMapper.deleteContractManagementById(id); | 183 | return contractManagementMapper.deleteContractManagementById(id); |
| 176 | } | 184 | } |
| 177 | - | ||
| 178 | - /** | ||
| 179 | - * 文件上传 | ||
| 180 | - */ | ||
| 181 | - public String uploadFile(MultipartFile file) throws IOException { | ||
| 182 | - // 上传文件路径 | ||
| 183 | - String filePath = trashConfig.getUploadPath(); | ||
| 184 | - // 上传并返回新文件名称 | ||
| 185 | - String newFileName = FileUploadUtils.upload(filePath, file); | ||
| 186 | - return newFileName; | ||
| 187 | - } | ||
| 188 | - | ||
| 189 | - /** | ||
| 190 | - * 文件删除 | ||
| 191 | - */ | ||
| 192 | - public void deleteFile(String filePath) throws IOException { | ||
| 193 | - filePath = filePath.substring(filePath.indexOf("/profile")+8); | ||
| 194 | - FileUploadUtils.deleteFile(filePath); | ||
| 195 | - } | ||
| 196 | } | 185 | } |
trash-workFlow/src/main/java/com/trash/office/service/impl/HandleAffairsServiceImpl.java
0 → 100644
| 1 | +package com.trash.office.service.impl; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import java.util.stream.Collectors; | ||
| 6 | + | ||
| 7 | +import com.trash.common.utils.DateUtils; | ||
| 8 | +import com.trash.common.utils.SecurityUtils; | ||
| 9 | +import com.trash.common.utils.file.FileUploadUtils; | ||
| 10 | +import com.trash.office.domain.ContractManagement; | ||
| 11 | +import com.trash.office.domain.LeaveApplication; | ||
| 12 | +import com.trash.office.domain.UploadFile; | ||
| 13 | +import com.trash.office.domain.vo.ConferenceVo; | ||
| 14 | +import com.trash.office.domain.vo.HandleAffairsVo; | ||
| 15 | +import com.trash.office.mapper.UploadFileMapper; | ||
| 16 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 17 | +import org.springframework.stereotype.Service; | ||
| 18 | +import com.trash.office.mapper.HandleAffairsMapper; | ||
| 19 | +import com.trash.office.domain.HandleAffairs; | ||
| 20 | +import com.trash.office.service.IHandleAffairsService; | ||
| 21 | +import org.springframework.transaction.annotation.Transactional; | ||
| 22 | +import org.springframework.web.multipart.MultipartFile; | ||
| 23 | + | ||
| 24 | +/** | ||
| 25 | + * 办文办事Service业务层处理 | ||
| 26 | + * | ||
| 27 | + * @author 2c | ||
| 28 | + * @date 2023-05-06 | ||
| 29 | + */ | ||
| 30 | +@Service | ||
| 31 | +public class HandleAffairsServiceImpl implements IHandleAffairsService { | ||
| 32 | + @Autowired | ||
| 33 | + private HandleAffairsMapper handleAffairsMapper; | ||
| 34 | + | ||
| 35 | + @Autowired | ||
| 36 | + private UploadFileMapper uploadFileMapper; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 查询办文办事 | ||
| 40 | + * | ||
| 41 | + * @param id 办文办事ID | ||
| 42 | + * @return 办文办事 | ||
| 43 | + */ | ||
| 44 | + @Override | ||
| 45 | + public HandleAffairsVo selectHandleAffairsById(Long id) { | ||
| 46 | + HandleAffairsVo handleAffairsVo = new HandleAffairsVo(); | ||
| 47 | + handleAffairsVo.setHandleAffairs(handleAffairsMapper.selectHandleAffairsById(id)); | ||
| 48 | + UploadFile uploadFile = new UploadFile(); | ||
| 49 | + uploadFile.setTableName("handle_affairs"); | ||
| 50 | + uploadFile.setTableNumber(handleAffairsVo.getHandleAffairs().getId().toString()); | ||
| 51 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 52 | + handleAffairsVo.setUploadFiles(list); | ||
| 53 | + return handleAffairsVo; | ||
| 54 | + } | ||
| 55 | + | ||
| 56 | + /** | ||
| 57 | + * 查询办文办事列表 | ||
| 58 | + * | ||
| 59 | + * @param handleAffairs 办文办事 | ||
| 60 | + * @return 办文办事 | ||
| 61 | + */ | ||
| 62 | + @Override | ||
| 63 | + public List<HandleAffairs> selectHandleAffairsList(HandleAffairs handleAffairs) { | ||
| 64 | + return handleAffairsMapper.selectHandleAffairsList(handleAffairs); | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + /** | ||
| 68 | + * 新增办文办事 | ||
| 69 | + * | ||
| 70 | + * @param handleAffairs 办文办事 | ||
| 71 | + * @return 结果 | ||
| 72 | + */ | ||
| 73 | + @Override | ||
| 74 | + @Transactional | ||
| 75 | + public int insertHandleAffairs(MultipartFile[] files,HandleAffairs handleAffairs) throws IOException { | ||
| 76 | + handleAffairs.setCreateBy(SecurityUtils.getUsername()); | ||
| 77 | + handleAffairs.setStatus(0); | ||
| 78 | + Integer result = handleAffairsMapper.insertHandleAffairs(handleAffairs); | ||
| 79 | + //文件上传 | ||
| 80 | + for (MultipartFile file : files) { | ||
| 81 | + UploadFile uploadFile = new UploadFile(); | ||
| 82 | + uploadFile.setTableName("handle_affairs"); | ||
| 83 | + uploadFile.setTableNumber(handleAffairs.getId().toString()); | ||
| 84 | + uploadFile.setFileName(file.getOriginalFilename()); | ||
| 85 | + uploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 86 | + uploadFileMapper.insertUploadFile(uploadFile); | ||
| 87 | + } | ||
| 88 | + return result; | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + /** | ||
| 92 | + * 修改办文办事 | ||
| 93 | + * | ||
| 94 | + * @param handleAffairs 办文办事 | ||
| 95 | + * @return 结果 | ||
| 96 | + */ | ||
| 97 | + @Override | ||
| 98 | + @Transactional | ||
| 99 | + public int updateHandleAffairs(MultipartFile[] files,HandleAffairsVo handleAffairsVo) throws IOException { | ||
| 100 | + handleAffairsVo.getHandleAffairs().setUpdateBy(SecurityUtils.getUsername()); | ||
| 101 | + //查询该合同下的文件上传数据然后删除数据库中的数据和文件 | ||
| 102 | + UploadFile uploadFile = new UploadFile(); | ||
| 103 | + uploadFile.setTableName("handle_affairs"); | ||
| 104 | + uploadFile.setTableNumber(handleAffairsVo.getHandleAffairs().getId().toString()); | ||
| 105 | + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 106 | + //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件 | ||
| 107 | + if (handleAffairsVo.getUploadFiles().size() != 0) { | ||
| 108 | + //获取两个list的交集 | ||
| 109 | + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> handleAffairsVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList()); | ||
| 110 | + //去掉交集得到需要删除的数据 | ||
| 111 | + uploadFileList.removeAll(distinctList); | ||
| 112 | + | ||
| 113 | + for (UploadFile distinctFile : uploadFileList) { | ||
| 114 | + uploadFileMapper.deleteUploadFileById(distinctFile.getId()); | ||
| 115 | + //删除文件 | ||
| 116 | + FileUploadUtils.deleteFile(distinctFile.getFilePath()); | ||
| 117 | + } | ||
| 118 | + } else { | ||
| 119 | + for (UploadFile uploadFile1 : uploadFileList) { | ||
| 120 | + //删除数据库数据 | ||
| 121 | + uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); | ||
| 122 | + //删除文件 | ||
| 123 | + FileUploadUtils.deleteFile(uploadFile1.getFilePath()); | ||
| 124 | + } | ||
| 125 | + } | ||
| 126 | + | ||
| 127 | + //添加新的文件 | ||
| 128 | + for (MultipartFile file : files) { | ||
| 129 | + UploadFile newUploadFile = new UploadFile(); | ||
| 130 | + newUploadFile.setTableName("handle_affairs"); | ||
| 131 | + newUploadFile.setTableNumber(handleAffairsVo.getHandleAffairs().getId().toString()); | ||
| 132 | + newUploadFile.setFileName(file.getOriginalFilename()); | ||
| 133 | + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 134 | + uploadFileMapper.insertUploadFile(newUploadFile); | ||
| 135 | + } | ||
| 136 | + return handleAffairsMapper.updateHandleAffairs(handleAffairsVo.getHandleAffairs()); | ||
| 137 | + } | ||
| 138 | + | ||
| 139 | + /** | ||
| 140 | + * 批量删除办文办事 | ||
| 141 | + * | ||
| 142 | + * @param ids 需要删除的办文办事ID | ||
| 143 | + * @return 结果 | ||
| 144 | + */ | ||
| 145 | + @Override | ||
| 146 | + @Transactional | ||
| 147 | + public int deleteHandleAffairsByIds(Long[] ids) { | ||
| 148 | + for (Long id : ids) { | ||
| 149 | + HandleAffairs handleAffairs = handleAffairsMapper.selectHandleAffairsById(id); | ||
| 150 | + UploadFile uploadFile = new UploadFile(); | ||
| 151 | + uploadFile.setTableName("handle_affairs"); | ||
| 152 | + uploadFile.setTableNumber(handleAffairs.getId().toString()); | ||
| 153 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 154 | + //遍历删除文件 | ||
| 155 | + for (UploadFile file : list) { | ||
| 156 | + uploadFileMapper.deleteUploadFileById(file.getId()); | ||
| 157 | + FileUploadUtils.deleteFile(file.getFilePath()); | ||
| 158 | + } | ||
| 159 | + } | ||
| 160 | + return handleAffairsMapper.deleteHandleAffairsByIds(ids); | ||
| 161 | + } | ||
| 162 | + | ||
| 163 | + /** | ||
| 164 | + * 删除办文办事信息 | ||
| 165 | + * | ||
| 166 | + * @param id 办文办事ID | ||
| 167 | + * @return 结果 | ||
| 168 | + */ | ||
| 169 | + @Override | ||
| 170 | + public int deleteHandleAffairsById(Long id) { | ||
| 171 | + return handleAffairsMapper.deleteHandleAffairsById(id); | ||
| 172 | + } | ||
| 173 | +} |
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
0 → 100644
| 1 | +package com.trash.office.service.impl; | ||
| 2 | + | ||
| 3 | +import java.io.IOException; | ||
| 4 | +import java.util.List; | ||
| 5 | +import java.util.stream.Collectors; | ||
| 6 | + | ||
| 7 | +import com.trash.common.utils.DateUtils; | ||
| 8 | +import com.trash.common.utils.SecurityUtils; | ||
| 9 | +import com.trash.common.utils.file.FileUploadUtils; | ||
| 10 | +import com.trash.office.domain.Conference; | ||
| 11 | +import com.trash.office.domain.UploadFile; | ||
| 12 | +import com.trash.office.domain.vo.HandleAffairsVo; | ||
| 13 | +import com.trash.office.domain.vo.LeaveApplicationVo; | ||
| 14 | +import com.trash.office.mapper.UploadFileMapper; | ||
| 15 | +import com.trash.workflow.domain.Workflow; | ||
| 16 | +import com.trash.workflow.mapper.WorkflowMapper; | ||
| 17 | +import com.trash.workflow.service.impl.WorkflowServiceImpl; | ||
| 18 | +import org.activiti.api.process.model.ProcessInstance; | ||
| 19 | +import org.activiti.api.process.model.builders.ProcessPayloadBuilder; | ||
| 20 | +import org.activiti.api.process.runtime.ProcessRuntime; | ||
| 21 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 22 | +import org.springframework.stereotype.Service; | ||
| 23 | +import com.trash.office.mapper.LeaveApplicationMapper; | ||
| 24 | +import com.trash.office.domain.LeaveApplication; | ||
| 25 | +import com.trash.office.service.ILeaveApplicationService; | ||
| 26 | +import org.springframework.transaction.annotation.Transactional; | ||
| 27 | +import org.springframework.web.multipart.MultipartFile; | ||
| 28 | + | ||
| 29 | +/** | ||
| 30 | + * leaveApplicationService业务层处理 | ||
| 31 | + * | ||
| 32 | + * @author 2c | ||
| 33 | + * @date 2023-05-04 | ||
| 34 | + */ | ||
| 35 | +@Service | ||
| 36 | +public class LeaveApplicationServiceImpl implements ILeaveApplicationService | ||
| 37 | +{ | ||
| 38 | + @Autowired | ||
| 39 | + private LeaveApplicationMapper leaveApplicationMapper; | ||
| 40 | + | ||
| 41 | + @Autowired | ||
| 42 | + private UploadFileMapper uploadFileMapper; | ||
| 43 | + | ||
| 44 | + @Autowired | ||
| 45 | + private ProcessRuntime processRuntime; | ||
| 46 | + | ||
| 47 | + @Autowired | ||
| 48 | + private WorkflowMapper workflowMapper; | ||
| 49 | + | ||
| 50 | + @Autowired | ||
| 51 | + private WorkflowServiceImpl workflowService; | ||
| 52 | + /** | ||
| 53 | + * 查询leaveApplication | ||
| 54 | + * | ||
| 55 | + * @param id leaveApplicationID | ||
| 56 | + * @return leaveApplication | ||
| 57 | + */ | ||
| 58 | + @Override | ||
| 59 | + public LeaveApplicationVo selectLeaveApplicationById(Long id) | ||
| 60 | + { | ||
| 61 | + LeaveApplicationVo leaveApplicationVo = new LeaveApplicationVo(); | ||
| 62 | + leaveApplicationVo.setLeaveApplication(leaveApplicationMapper.selectLeaveApplicationById(id)); | ||
| 63 | + UploadFile uploadFile = new UploadFile(); | ||
| 64 | + uploadFile.setTableName("leave_application"); | ||
| 65 | + uploadFile.setTableNumber(leaveApplicationVo.getLeaveApplication().getId().toString()); | ||
| 66 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 67 | + leaveApplicationVo.setUploadFiles(list); | ||
| 68 | + return leaveApplicationVo; | ||
| 69 | + } | ||
| 70 | + | ||
| 71 | + /** | ||
| 72 | + * 查询leaveApplication列表 | ||
| 73 | + * | ||
| 74 | + * @param leaveApplication leaveApplication | ||
| 75 | + * @return leaveApplication | ||
| 76 | + */ | ||
| 77 | + @Override | ||
| 78 | + public List<LeaveApplication> selectLeaveApplicationList(LeaveApplication leaveApplication) | ||
| 79 | + { | ||
| 80 | + return leaveApplicationMapper.selectLeaveApplicationList(leaveApplication); | ||
| 81 | + } | ||
| 82 | + | ||
| 83 | + /** | ||
| 84 | + * 新增leaveApplication | ||
| 85 | + * | ||
| 86 | + * @param leaveApplication leaveApplication | ||
| 87 | + * @return 结果 | ||
| 88 | + */ | ||
| 89 | + @Override | ||
| 90 | + @Transactional | ||
| 91 | + public int insertLeaveApplication(MultipartFile[] files,LeaveApplication leaveApplication) throws IOException { | ||
| 92 | + leaveApplication.setCreateBy(SecurityUtils.getUsername()); | ||
| 93 | + leaveApplication.setStatus(0); | ||
| 94 | + leaveApplication.setPositionId(Long.parseLong("2")); | ||
| 95 | + Integer result = leaveApplicationMapper.insertLeaveApplication(leaveApplication); | ||
| 96 | + initiatingProcess(leaveApplication); | ||
| 97 | + //文件上传 | ||
| 98 | + for (MultipartFile file : files) { | ||
| 99 | + UploadFile uploadFile = new UploadFile(); | ||
| 100 | + uploadFile.setTableName("leave_application"); | ||
| 101 | + uploadFile.setTableNumber(leaveApplication.getId().toString()); | ||
| 102 | + uploadFile.setFileName(file.getOriginalFilename()); | ||
| 103 | + uploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 104 | + uploadFileMapper.insertUploadFile(uploadFile); | ||
| 105 | + } | ||
| 106 | + return result; | ||
| 107 | + } | ||
| 108 | + | ||
| 109 | + /** | ||
| 110 | + * 修改leaveApplication | ||
| 111 | + * | ||
| 112 | + * @param leaveApplication leaveApplication | ||
| 113 | + * @return 结果 | ||
| 114 | + */ | ||
| 115 | + @Override | ||
| 116 | + @Transactional | ||
| 117 | + public int updateLeaveApplication(MultipartFile[] files,LeaveApplicationVo leaveApplicationVo) throws IOException { | ||
| 118 | + leaveApplicationVo.getLeaveApplication().setUpdateBy(SecurityUtils.getUsername()); | ||
| 119 | + //查询该合同下的文件上传数据然后删除数据库中的数据和文件 | ||
| 120 | + UploadFile uploadFile = new UploadFile(); | ||
| 121 | + uploadFile.setTableName("leave_application"); | ||
| 122 | + uploadFile.setTableNumber(leaveApplicationVo.getLeaveApplication().getId().toString()); | ||
| 123 | + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 124 | + //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件 | ||
| 125 | + if (leaveApplicationVo.getUploadFiles().size() != 0) { | ||
| 126 | + //获取两个list的交集 | ||
| 127 | + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> leaveApplicationVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList()); | ||
| 128 | + //去掉交集得到需要删除的数据 | ||
| 129 | + uploadFileList.removeAll(distinctList); | ||
| 130 | + | ||
| 131 | + for (UploadFile distinctFile : uploadFileList) { | ||
| 132 | + uploadFileMapper.deleteUploadFileById(distinctFile.getId()); | ||
| 133 | + //删除文件 | ||
| 134 | + FileUploadUtils.deleteFile(distinctFile.getFilePath()); | ||
| 135 | + } | ||
| 136 | + } else { | ||
| 137 | + for (UploadFile uploadFile1 : uploadFileList) { | ||
| 138 | + //删除数据库数据 | ||
| 139 | + uploadFileMapper.deleteUploadFileById(uploadFile1.getId()); | ||
| 140 | + //删除文件 | ||
| 141 | + FileUploadUtils.deleteFile(uploadFile1.getFilePath()); | ||
| 142 | + } | ||
| 143 | + } | ||
| 144 | + | ||
| 145 | + //添加新的文件 | ||
| 146 | + for (MultipartFile file : files) { | ||
| 147 | + UploadFile newUploadFile = new UploadFile(); | ||
| 148 | + newUploadFile.setTableName("leave_application"); | ||
| 149 | + newUploadFile.setTableNumber(leaveApplicationVo.getLeaveApplication().getId().toString()); | ||
| 150 | + newUploadFile.setFileName(file.getOriginalFilename()); | ||
| 151 | + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file)); | ||
| 152 | + uploadFileMapper.insertUploadFile(newUploadFile); | ||
| 153 | + } | ||
| 154 | + if(leaveApplicationVo.getLeaveApplication().getStatus()==2){ | ||
| 155 | + //重置审批状态并发起流程 | ||
| 156 | + leaveApplicationVo.getLeaveApplication().setStatus(0); | ||
| 157 | + initiatingProcess(leaveApplicationVo.getLeaveApplication()); | ||
| 158 | + } | ||
| 159 | + return leaveApplicationMapper.updateLeaveApplication(leaveApplicationVo.getLeaveApplication()); | ||
| 160 | + } | ||
| 161 | + | ||
| 162 | + /** | ||
| 163 | + * 批量删除leaveApplication | ||
| 164 | + * | ||
| 165 | + * @param ids 需要删除的leaveApplicationID | ||
| 166 | + * @return 结果 | ||
| 167 | + */ | ||
| 168 | + @Override | ||
| 169 | + @Transactional | ||
| 170 | + public int deleteLeaveApplicationByIds(Long[] ids) | ||
| 171 | + { | ||
| 172 | + for (Long id : ids) { | ||
| 173 | + LeaveApplication leaveApplication = leaveApplicationMapper.selectLeaveApplicationById(id); | ||
| 174 | + UploadFile uploadFile = new UploadFile(); | ||
| 175 | + uploadFile.setTableName("leave_application"); | ||
| 176 | + uploadFile.setTableNumber(leaveApplication.getId().toString()); | ||
| 177 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 178 | + //遍历删除文件 | ||
| 179 | + for (UploadFile file : list) { | ||
| 180 | + uploadFileMapper.deleteUploadFileById(file.getId()); | ||
| 181 | + FileUploadUtils.deleteFile(file.getFilePath()); | ||
| 182 | + } | ||
| 183 | + } | ||
| 184 | + return leaveApplicationMapper.deleteLeaveApplicationByIds(ids); | ||
| 185 | + } | ||
| 186 | + | ||
| 187 | + /** | ||
| 188 | + * 删除leaveApplication信息 | ||
| 189 | + * | ||
| 190 | + * @param id leaveApplicationID | ||
| 191 | + * @return 结果 | ||
| 192 | + */ | ||
| 193 | + @Override | ||
| 194 | + public int deleteLeaveApplicationById(Long id) | ||
| 195 | + { | ||
| 196 | + return leaveApplicationMapper.deleteLeaveApplicationById(id); | ||
| 197 | + } | ||
| 198 | + | ||
| 199 | + /** | ||
| 200 | + * 发起流程 | ||
| 201 | + * @param leaveApplication | ||
| 202 | + */ | ||
| 203 | + public void initiatingProcess(LeaveApplication leaveApplication){ | ||
| 204 | + List<String> roleIds = SecurityUtils.getLoginUser().getUser().getRoleIds(); | ||
| 205 | + Integer roleId = 0; | ||
| 206 | + for (String role : roleIds){ | ||
| 207 | + //如果是角色id为3的则为部长或部长以上 | ||
| 208 | + if(Integer.parseInt(role)<3){ | ||
| 209 | + roleId = 1; | ||
| 210 | + break; | ||
| 211 | + }else{ | ||
| 212 | + roleId = 0; | ||
| 213 | + } | ||
| 214 | + } | ||
| 215 | + roleId = 0; | ||
| 216 | + String numberDays = leaveApplication.getNumberDays(); | ||
| 217 | + //新增工作台数据 | ||
| 218 | + Workflow workflow = new Workflow(); | ||
| 219 | + workflow.setId(leaveApplication.getId().toString()); | ||
| 220 | + workflow.setTitle("请假申请:" + leaveApplication.getApplicant()); | ||
| 221 | + workflow.setType("请假申请"); | ||
| 222 | + workflow.setReason("请假申请"); | ||
| 223 | + workflow.setState("0"); | ||
| 224 | + workflow.setCreateBy(SecurityUtils.getUsername()); | ||
| 225 | + workflow.setCreateTime(DateUtils.getNowDate()); | ||
| 226 | + if(roleId!=1 && !"0.5".equals(numberDays)){//判断非部长 && 请假天数不等于0.5天 | ||
| 227 | + workflowService.createLeaveWorkFlow(workflow,0); | ||
| 228 | + }else if(roleId==1 && !"0.5".equals(numberDays)){//判断部长 && 请假天数不等于0.5天 | ||
| 229 | + workflowService.createLeaveWorkFlow(workflow,1); | ||
| 230 | + }else if(roleId!=1 && "0.5".equals(numberDays)){//判断非部长 && 请假天数等于0.5天 | ||
| 231 | + workflowService.createLeaveWorkFlow(workflow,2); | ||
| 232 | + }else if(roleId==1 && "0.5".equals(numberDays)){//部长 && 请假天数等于0.5天 | ||
| 233 | + workflowService.createLeaveWorkFlow(workflow,3); | ||
| 234 | + } | ||
| 235 | + } | ||
| 236 | +} |
trash-workFlow/src/main/java/com/trash/office/service/impl/LogisticsManagementServiceImpl.java
0 → 100644
| 1 | +package com.trash.office.service.impl; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | + | ||
| 5 | +import com.trash.common.utils.DateUtils; | ||
| 6 | +import com.trash.common.utils.SecurityUtils; | ||
| 7 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 8 | +import org.springframework.stereotype.Service; | ||
| 9 | +import com.trash.office.mapper.LogisticsManagementMapper; | ||
| 10 | +import com.trash.office.domain.LogisticsManagement; | ||
| 11 | +import com.trash.office.service.ILogisticsManagementService; | ||
| 12 | +import org.springframework.transaction.annotation.Transactional; | ||
| 13 | + | ||
| 14 | +/** | ||
| 15 | + * 后勤管理Service业务层处理 | ||
| 16 | + * | ||
| 17 | + * @author 2c | ||
| 18 | + * @date 2023-05-08 | ||
| 19 | + */ | ||
| 20 | +@Service | ||
| 21 | +public class LogisticsManagementServiceImpl implements ILogisticsManagementService { | ||
| 22 | + | ||
| 23 | + @Autowired | ||
| 24 | + private LogisticsManagementMapper logisticsManagementMapper; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 查询后勤管理 | ||
| 28 | + * | ||
| 29 | + * @param id 后勤管理ID | ||
| 30 | + * @return 后勤管理 | ||
| 31 | + */ | ||
| 32 | + @Override | ||
| 33 | + public LogisticsManagement selectLogisticsManagementById(Long id) { | ||
| 34 | + return logisticsManagementMapper.selectLogisticsManagementById(id); | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + /** | ||
| 38 | + * 查询后勤管理列表 | ||
| 39 | + * | ||
| 40 | + * @param logisticsManagement 后勤管理 | ||
| 41 | + * @return 后勤管理 | ||
| 42 | + */ | ||
| 43 | + @Override | ||
| 44 | + public List<LogisticsManagement> selectLogisticsManagementList(LogisticsManagement logisticsManagement) { | ||
| 45 | + return logisticsManagementMapper.selectLogisticsManagementList(logisticsManagement); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * 新增后勤管理 | ||
| 50 | + * | ||
| 51 | + * @param logisticsManagement 后勤管理 | ||
| 52 | + * @return 结果 | ||
| 53 | + */ | ||
| 54 | + @Override | ||
| 55 | + @Transactional | ||
| 56 | + public int insertLogisticsManagement(LogisticsManagement logisticsManagement) { | ||
| 57 | + logisticsManagement.setCreateBy(SecurityUtils.getUsername()); | ||
| 58 | + logisticsManagement.setStatus(0); | ||
| 59 | + return logisticsManagementMapper.insertLogisticsManagement(logisticsManagement); | ||
| 60 | + } | ||
| 61 | + | ||
| 62 | + /** | ||
| 63 | + * 修改后勤管理 | ||
| 64 | + * | ||
| 65 | + * @param logisticsManagement 后勤管理 | ||
| 66 | + * @return 结果 | ||
| 67 | + */ | ||
| 68 | + @Override | ||
| 69 | + @Transactional | ||
| 70 | + public int updateLogisticsManagement(LogisticsManagement logisticsManagement) { | ||
| 71 | + logisticsManagement.setUpdateBy(SecurityUtils.getUsername()); | ||
| 72 | + return logisticsManagementMapper.updateLogisticsManagement(logisticsManagement); | ||
| 73 | + } | ||
| 74 | + | ||
| 75 | + /** | ||
| 76 | + * 批量删除后勤管理 | ||
| 77 | + * | ||
| 78 | + * @param ids 需要删除的后勤管理ID | ||
| 79 | + * @return 结果 | ||
| 80 | + */ | ||
| 81 | + @Override | ||
| 82 | + @Transactional | ||
| 83 | + public int deleteLogisticsManagementByIds(Long[] ids) { | ||
| 84 | + return logisticsManagementMapper.deleteLogisticsManagementByIds(ids); | ||
| 85 | + } | ||
| 86 | + | ||
| 87 | + /** | ||
| 88 | + * 删除后勤管理信息 | ||
| 89 | + * | ||
| 90 | + * @param id 后勤管理ID | ||
| 91 | + * @return 结果 | ||
| 92 | + */ | ||
| 93 | + @Override | ||
| 94 | + public int deleteLogisticsManagementById(Long id) { | ||
| 95 | + return logisticsManagementMapper.deleteLogisticsManagementById(id); | ||
| 96 | + } | ||
| 97 | +} |
trash-workFlow/src/main/java/com/trash/office/service/impl/UploadFileServiceImpl.java
| @@ -90,4 +90,12 @@ public class UploadFileServiceImpl implements IUploadFileService | @@ -90,4 +90,12 @@ public class UploadFileServiceImpl implements IUploadFileService | ||
| 90 | { | 90 | { |
| 91 | return uploadFileMapper.deleteUploadFileById(id); | 91 | return uploadFileMapper.deleteUploadFileById(id); |
| 92 | } | 92 | } |
| 93 | + | ||
| 94 | + public List<UploadFile> selectUploadFileListByNameAndNumber(String name,String number) { | ||
| 95 | + UploadFile uploadFile = new UploadFile(); | ||
| 96 | + uploadFile.setTableName(name); | ||
| 97 | + uploadFile.setTableNumber(number); | ||
| 98 | + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile); | ||
| 99 | + return list; | ||
| 100 | + } | ||
| 93 | } | 101 | } |
trash-workFlow/src/main/java/com/trash/workflow/listener/leaveEndListener.java
| 1 | package com.trash.workflow.listener; | 1 | package com.trash.workflow.listener; |
| 2 | 2 | ||
| 3 | +import com.trash.office.domain.Conference; | ||
| 4 | +import com.trash.office.mapper.ConferenceMapper; | ||
| 5 | +import com.trash.common.utils.spring.SpringUtils; | ||
| 6 | + | ||
| 3 | import org.activiti.engine.delegate.DelegateExecution; | 7 | import org.activiti.engine.delegate.DelegateExecution; |
| 4 | import org.activiti.engine.delegate.ExecutionListener; | 8 | import org.activiti.engine.delegate.ExecutionListener; |
| 5 | import org.activiti.engine.delegate.Expression; | 9 | import org.activiti.engine.delegate.Expression; |
| @@ -10,7 +14,7 @@ public class leaveEndListener implements ExecutionListener { | @@ -10,7 +14,7 @@ public class leaveEndListener implements ExecutionListener { | ||
| 10 | 14 | ||
| 11 | @Override | 15 | @Override |
| 12 | public void notify(DelegateExecution delegateExecution) { | 16 | public void notify(DelegateExecution delegateExecution) { |
| 13 | - | 17 | + |
| 14 | System.out.println(state.getValue(delegateExecution)); | 18 | System.out.println(state.getValue(delegateExecution)); |
| 15 | } | 19 | } |
| 16 | } | 20 | } |
trash-workFlow/src/main/java/com/trash/workflow/mapper/WorkflowMapper.java
| @@ -20,13 +20,13 @@ public interface WorkflowMapper | @@ -20,13 +20,13 @@ public interface WorkflowMapper | ||
| 20 | * @param id 请假ID | 20 | * @param id 请假ID |
| 21 | * @return 请假 | 21 | * @return 请假 |
| 22 | */ | 22 | */ |
| 23 | - public Workflow selectWorkflowById(String id); /** | 23 | + Workflow selectWorkflowById(String id); /** |
| 24 | * 查询请假 | 24 | * 查询请假 |
| 25 | * | 25 | * |
| 26 | * @param instanceId 请假ID | 26 | * @param instanceId 请假ID |
| 27 | * @return 请假 | 27 | * @return 请假 |
| 28 | */ | 28 | */ |
| 29 | - public Workflow selectWorkflowByInstanceId(String instanceId); | 29 | +Workflow selectWorkflowByInstanceId(String instanceId); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 查询请假列表根据部门编号和Workflow | 32 | * 查询请假列表根据部门编号和Workflow |
| @@ -34,14 +34,14 @@ public interface WorkflowMapper | @@ -34,14 +34,14 @@ public interface WorkflowMapper | ||
| 34 | * @param Workflow 请假 | 34 | * @param Workflow 请假 |
| 35 | * @return 请假集合 | 35 | * @return 请假集合 |
| 36 | */ | 36 | */ |
| 37 | - public List<Workflow> selectWorkflowListByWorkflowAndDeptId(@Param("Workflow")Workflow Workflow,@Param("deptId") Long deptId); | 37 | + List<Workflow> selectWorkflowListByWorkflowAndDeptId(@Param("Workflow") Workflow Workflow, @Param("deptId") Long deptId); |
| 38 | /** | 38 | /** |
| 39 | * 查询请假列表 | 39 | * 查询请假列表 |
| 40 | * | 40 | * |
| 41 | * @param Workflow 请假 | 41 | * @param Workflow 请假 |
| 42 | * @return 请假集合 | 42 | * @return 请假集合 |
| 43 | */ | 43 | */ |
| 44 | - public List<Workflow> selectWorkflowList(Workflow Workflow); | 44 | + List<Workflow> selectWorkflowList(Workflow Workflow); |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| @@ -50,7 +50,7 @@ public interface WorkflowMapper | @@ -50,7 +50,7 @@ public interface WorkflowMapper | ||
| 50 | * @param Workflow 请假 | 50 | * @param Workflow 请假 |
| 51 | * @return 结果 | 51 | * @return 结果 |
| 52 | */ | 52 | */ |
| 53 | - public int insertWorkflow(Workflow Workflow); | 53 | + int insertWorkflow(Workflow Workflow); |
| 54 | 54 | ||
| 55 | public int insertWorkflowHistory(Workflow Workflow); | 55 | public int insertWorkflowHistory(Workflow Workflow); |
| 56 | 56 | ||
| @@ -60,7 +60,7 @@ public interface WorkflowMapper | @@ -60,7 +60,7 @@ public interface WorkflowMapper | ||
| 60 | * @param Workflow 请假 | 60 | * @param Workflow 请假 |
| 61 | * @return 结果 | 61 | * @return 结果 |
| 62 | */ | 62 | */ |
| 63 | - public int updateWorkflow(Workflow Workflow); | 63 | + int updateWorkflow(Workflow Workflow); |
| 64 | 64 | ||
| 65 | /** | 65 | /** |
| 66 | * 删除请假 | 66 | * 删除请假 |
| @@ -68,7 +68,7 @@ public interface WorkflowMapper | @@ -68,7 +68,7 @@ public interface WorkflowMapper | ||
| 68 | * @param id 请假ID | 68 | * @param id 请假ID |
| 69 | * @return 结果 | 69 | * @return 结果 |
| 70 | */ | 70 | */ |
| 71 | - public int deleteWorkflowById(String id); | 71 | + int deleteWorkflowById(String id); |
| 72 | 72 | ||
| 73 | /** | 73 | /** |
| 74 | * 批量删除请假 | 74 | * 批量删除请假 |
| @@ -76,6 +76,6 @@ public interface WorkflowMapper | @@ -76,6 +76,6 @@ public interface WorkflowMapper | ||
| 76 | * @param ids 需要删除的数据ID | 76 | * @param ids 需要删除的数据ID |
| 77 | * @return 结果 | 77 | * @return 结果 |
| 78 | */ | 78 | */ |
| 79 | - public int deleteWorkflowByIds(String[] ids); | 79 | + int deleteWorkflowByIds(String[] ids); |
| 80 | public void deleteWorkflowByName(String str); | 80 | public void deleteWorkflowByName(String str); |
| 81 | } | 81 | } |
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
| @@ -15,14 +15,14 @@ import com.trash.workflow.domain.Workflow; | @@ -15,14 +15,14 @@ import com.trash.workflow.domain.Workflow; | ||
| 15 | */ | 15 | */ |
| 16 | public interface IWorkflowService | 16 | public interface IWorkflowService |
| 17 | { | 17 | { |
| 18 | - public int createWorkFlow(Map<String,Object> map); | 18 | + int createWorkFlow(Map<String, Object> map); |
| 19 | /** | 19 | /** |
| 20 | * 查询请假 | 20 | * 查询请假 |
| 21 | * | 21 | * |
| 22 | * @param id 请假ID | 22 | * @param id 请假ID |
| 23 | * @return 请假 | 23 | * @return 请假 |
| 24 | */ | 24 | */ |
| 25 | - public Workflow selectWorkflowById(String id); | 25 | + Workflow selectWorkflowById(String id); |
| 26 | 26 | ||
| 27 | /** | 27 | /** |
| 28 | * 查询请假列表 | 28 | * 查询请假列表 |
| @@ -30,7 +30,7 @@ public interface IWorkflowService | @@ -30,7 +30,7 @@ public interface IWorkflowService | ||
| 30 | * @param Workflow 请假 | 30 | * @param Workflow 请假 |
| 31 | * @return 请假集合 | 31 | * @return 请假集合 |
| 32 | */ | 32 | */ |
| 33 | - public List<Workflow> selectWorkflowList(Workflow Workflow); | 33 | + List<Workflow> selectWorkflowList(Workflow Workflow); |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * 查询请假列表 | 36 | * 查询请假列表 |
| @@ -38,7 +38,7 @@ public interface IWorkflowService | @@ -38,7 +38,7 @@ public interface IWorkflowService | ||
| 38 | * @param Workflow 请假 | 38 | * @param Workflow 请假 |
| 39 | * @return 请假集合 | 39 | * @return 请假集合 |
| 40 | */ | 40 | */ |
| 41 | - public List<Workflow> selectWorkflowAndTaskNameList(Workflow Workflow); | 41 | + List<Workflow> selectWorkflowAndTaskNameList(Workflow Workflow); |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * 新增请假 | 44 | * 新增请假 |
| @@ -46,7 +46,7 @@ public interface IWorkflowService | @@ -46,7 +46,7 @@ public interface IWorkflowService | ||
| 46 | * @param Workflow 请假 | 46 | * @param Workflow 请假 |
| 47 | * @return 结果 | 47 | * @return 结果 |
| 48 | */ | 48 | */ |
| 49 | - public int insertWorkflow(Workflow Workflow); | 49 | + int insertWorkflow(Workflow Workflow); |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | /** | 52 | /** |
| @@ -55,7 +55,7 @@ public interface IWorkflowService | @@ -55,7 +55,7 @@ public interface IWorkflowService | ||
| 55 | * @param Workflow 请假 | 55 | * @param Workflow 请假 |
| 56 | * @return 结果 | 56 | * @return 结果 |
| 57 | */ | 57 | */ |
| 58 | - public int updateWorkflow(Workflow Workflow); | 58 | + int updateWorkflow(Workflow Workflow); |
| 59 | 59 | ||
| 60 | /** | 60 | /** |
| 61 | * 批量删除请假 | 61 | * 批量删除请假 |
| @@ -63,7 +63,7 @@ public interface IWorkflowService | @@ -63,7 +63,7 @@ public interface IWorkflowService | ||
| 63 | * @param ids 需要删除的请假ID | 63 | * @param ids 需要删除的请假ID |
| 64 | * @return 结果 | 64 | * @return 结果 |
| 65 | */ | 65 | */ |
| 66 | - public int deleteWorkflowByIds(String[] ids); | 66 | + int deleteWorkflowByIds(String[] ids); |
| 67 | 67 | ||
| 68 | /** | 68 | /** |
| 69 | * 删除请假信息 | 69 | * 删除请假信息 |
| @@ -71,12 +71,12 @@ public interface IWorkflowService | @@ -71,12 +71,12 @@ public interface IWorkflowService | ||
| 71 | * @param id 请假ID | 71 | * @param id 请假ID |
| 72 | * @return 结果 | 72 | * @return 结果 |
| 73 | */ | 73 | */ |
| 74 | - public int deleteWorkflowById(String id); | 74 | + int deleteWorkflowById(String id); |
| 75 | 75 | ||
| 76 | 76 | ||
| 77 | - int createLeaveWorkFlow(Map<String,Object> data); | 77 | + int createLeaveWorkFlow(Workflow workflow,int index); |
| 78 | 78 | ||
| 79 | - public Workflow selectWorkflowByInstanceId(String instanceId); | 79 | + Workflow selectWorkflowByInstanceId(String instanceId); |
| 80 | int createThreeStepWorkFlow(SupervisionThreestep supervision); | 80 | int createThreeStepWorkFlow(SupervisionThreestep supervision); |
| 81 | 81 | ||
| 82 | public void deleteWorkflowByName(String string); | 82 | public void deleteWorkflowByName(String string); |
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
| @@ -110,52 +110,47 @@ public class WorkflowServiceImpl implements IWorkflowService { | @@ -110,52 +110,47 @@ public class WorkflowServiceImpl implements IWorkflowService { | ||
| 110 | return 0; | 110 | return 0; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | - @Override | ||
| 114 | - @Transactional | ||
| 115 | - public int createLeaveWorkFlow(Map<String, Object> data) { | ||
| 116 | - | ||
| 117 | - String flowType = data.get("type").toString(); | ||
| 118 | - | ||
| 119 | - Map map = (Map) data.get("data"); | 113 | + |
| 114 | + @Override | ||
| 115 | + @Transactional | ||
| 116 | + public int createLeaveWorkFlow(Workflow workflow,int index) { | ||
| 117 | + ProcessInstance processInstance = null; | ||
| 120 | 118 | ||
| 121 | - String businessKey = flowType + ":" + map.get("id"); // 流程对应事务key | ||
| 122 | - String title = map.get("title").toString(); | 119 | + try { |
| 123 | 120 | ||
| 124 | - String reason = map.get("reason").toString(); | ||
| 125 | - String startTime = map.get("startTime").toString(); | ||
| 126 | - String endTime = map.get("endTime").toString(); | 121 | + processInstance = processRuntime.start(ProcessPayloadBuilder |
| 122 | + .start() | ||
| 123 | + .withProcessDefinitionKey("workflow_leave") | ||
| 124 | + .withName(workflow.getTitle()) | ||
| 125 | + .withBusinessKey("workflow_leave:"+workflow.getId()) | ||
| 126 | + .withVariable("route",index) | ||
| 127 | + .build()); | ||
| 127 | 128 | ||
| 128 | - ProcessInstance processInstance = null; | ||
| 129 | 129 | ||
| 130 | - try { | ||
| 131 | 130 | ||
| 132 | - processInstance = processRuntime.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType) | ||
| 133 | - .withName(title).withBusinessKey(businessKey).build()); | ||
| 134 | 131 | ||
| 135 | - List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); | ||
| 136 | - | ||
| 137 | - Workflow workflow = new Workflow(); | ||
| 138 | - workflow.setId(businessKey); | ||
| 139 | - workflow.setTitle(title); | ||
| 140 | - workflow.setReason(reason); | ||
| 141 | - workflow.setStartTime(startTime); | ||
| 142 | - workflow.setEndTime(endTime); | ||
| 143 | - workflow.setType(siteType[Integer.parseInt(map.get("type").toString())]); | 132 | +// Workflow workflow = new Workflow(); |
| 133 | +// workflow.setId(businessKey); | ||
| 134 | +// workflow.setTitle(title); | ||
| 135 | +// workflow.setReason(reason); | ||
| 136 | +// workflow.setStartTime(startTime); | ||
| 137 | +// workflow.setEndTime(endTime); | ||
| 138 | +// workflow.setType(siteType[Integer.parseInt(map.get("type").toString())]); | ||
| 144 | workflow.setInstanceId(processInstance.getId()); | 139 | workflow.setInstanceId(processInstance.getId()); |
| 145 | - workflow.setState("0"); | ||
| 146 | - | ||
| 147 | - return workflowMapper.insertWorkflow(workflow); | ||
| 148 | - } catch (Exception e) { | ||
| 149 | - | ||
| 150 | - processRuntime.delete(ProcessPayloadBuilder.delete(processInstance)); | ||
| 151 | - | ||
| 152 | - e.printStackTrace(); | 140 | +// workflow.setState("0"); |
| 141 | + | ||
| 142 | + return workflowMapper.insertWorkflow(workflow); | ||
| 143 | + } catch (Exception e) { | ||
| 144 | + | ||
| 145 | + processRuntime.delete(ProcessPayloadBuilder.delete(processInstance)); | ||
| 146 | + | ||
| 147 | + e.printStackTrace(); | ||
| 153 | } | 148 | } |
| 154 | - | ||
| 155 | - return 0; | ||
| 156 | - } | ||
| 157 | - | ||
| 158 | - @Override | 149 | + |
| 150 | + return 0; | ||
| 151 | + } | ||
| 152 | + | ||
| 153 | + @Override | ||
| 159 | @Transactional | 154 | @Transactional |
| 160 | public int createThreeStepWorkFlow(SupervisionThreestep supervision){ | 155 | public int createThreeStepWorkFlow(SupervisionThreestep supervision){ |
| 161 | ProcessInstance processInstance = null; | 156 | ProcessInstance processInstance = null; |
| @@ -168,66 +163,66 @@ public class WorkflowServiceImpl implements IWorkflowService { | @@ -168,66 +163,66 @@ public class WorkflowServiceImpl implements IWorkflowService { | ||
| 168 | .build()); | 163 | .build()); |
| 169 | 164 | ||
| 170 | JSONArray array = RemoteServerUtils.getAreas(); | 165 | JSONArray array = RemoteServerUtils.getAreas(); |
| 171 | - | 166 | + |
| 172 | Map map = new HashedMap<>(); | 167 | Map map = new HashedMap<>(); |
| 173 | - | 168 | + |
| 174 | map.put("type", "CSUserDepartmentType"); | 169 | map.put("type", "CSUserDepartmentType"); |
| 175 | - | 170 | + |
| 176 | JSONArray array2 = RemoteServerUtils.getDict(map); | 171 | JSONArray array2 = RemoteServerUtils.getDict(map); |
| 177 | - | 172 | + |
| 178 | String placeName = null; | 173 | String placeName = null; |
| 179 | - | 174 | + |
| 180 | for(Object obj:array){ | 175 | for(Object obj:array){ |
| 181 | if(((JSONObject)(obj)).getString("code").equals(supervision.getPlace())){ | 176 | if(((JSONObject)(obj)).getString("code").equals(supervision.getPlace())){ |
| 182 | - | 177 | + |
| 183 | placeName = ((JSONObject)(obj)).getString("name"); | 178 | placeName = ((JSONObject)(obj)).getString("name"); |
| 184 | - | 179 | + |
| 185 | break; | 180 | break; |
| 186 | } | 181 | } |
| 187 | - | 182 | + |
| 188 | } | 183 | } |
| 189 | - | 184 | + |
| 190 | if(placeName != null){ | 185 | if(placeName != null){ |
| 191 | - | 186 | + |
| 192 | String placeCode = null; | 187 | String placeCode = null; |
| 193 | String code = null; | 188 | String code = null; |
| 194 | - | 189 | + |
| 195 | for(Object obj:array2){ | 190 | for(Object obj:array2){ |
| 196 | if(((JSONObject)obj).getString("name").equals("渣土办")){ | 191 | if(((JSONObject)obj).getString("name").equals("渣土办")){ |
| 197 | code = ((JSONObject)(obj)).getString("code"); | 192 | code = ((JSONObject)(obj)).getString("code"); |
| 198 | } | 193 | } |
| 199 | if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){ | 194 | if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){ |
| 200 | placeCode = ((JSONObject)(obj)).getString("code"); | 195 | placeCode = ((JSONObject)(obj)).getString("code"); |
| 201 | - | 196 | + |
| 202 | if(code != null){ | 197 | if(code != null){ |
| 203 | break; | 198 | break; |
| 204 | } | 199 | } |
| 205 | } | 200 | } |
| 206 | - | 201 | + |
| 207 | } | 202 | } |
| 208 | - | ||
| 209 | - | 203 | + |
| 204 | + | ||
| 210 | // List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); | 205 | // List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); |
| 211 | - | 206 | + |
| 212 | if(placeCode != null){ | 207 | if(placeCode != null){ |
| 213 | Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); | 208 | Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); |
| 214 | - | ||
| 215 | - | 209 | + |
| 210 | + | ||
| 216 | List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId()); | 211 | List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId()); |
| 217 | - | 212 | + |
| 218 | for(IdentityLink identityLink:list){ | 213 | for(IdentityLink identityLink:list){ |
| 219 | // if(identityLink.getGroupId() != null) | 214 | // if(identityLink.getGroupId() != null) |
| 220 | // taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType()); | 215 | // taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType()); |
| 221 | if(identityLink.getUserId() != null) | 216 | if(identityLink.getUserId() != null) |
| 222 | taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType()); | 217 | taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType()); |
| 223 | } | 218 | } |
| 224 | - | 219 | + |
| 225 | taskService.addCandidateUser(task.getId(), placeCode); | 220 | taskService.addCandidateUser(task.getId(), placeCode); |
| 226 | - | 221 | + |
| 227 | taskService.saveTask(task); | 222 | taskService.saveTask(task); |
| 228 | } | 223 | } |
| 229 | } | 224 | } |
| 230 | - | 225 | + |
| 231 | 226 | ||
| 232 | Workflow workflow = new Workflow(); | 227 | Workflow workflow = new Workflow(); |
| 233 | workflow.setId("workflow_threestep:" + supervision.getId()); | 228 | workflow.setId("workflow_threestep:" + supervision.getId()); |
trash-workFlow/src/main/resources/mapper/casefile/ReplyApprovalProcessMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.casefile.mapper.ReplyApprovalProcessMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="ReplyApprovalProcess" id="ReplyApprovalProcessResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="tableName" column="table_name" /> | ||
| 10 | + <result property="tableId" column="table_id" /> | ||
| 11 | + <result property="instanceId" column="instance_id" /> | ||
| 12 | + <result property="reply" column="reply" /> | ||
| 13 | + <result property="replyTime" column="reply_time" /> | ||
| 14 | + <result property="replyImg" column="reply_img" /> | ||
| 15 | + <result property="replyPeople" column="reply_people" /> | ||
| 16 | + </resultMap> | ||
| 17 | + | ||
| 18 | + <sql id="selectReplyApprovalProcessVo"> | ||
| 19 | + select id, table_name, table_id, instance_id, reply, reply_time, reply_img, reply_people from reply_approval_process | ||
| 20 | + </sql> | ||
| 21 | + | ||
| 22 | + <select id="selectReplyApprovalProcessList" parameterType="ReplyApprovalProcess" resultMap="ReplyApprovalProcessResult"> | ||
| 23 | + <include refid="selectReplyApprovalProcessVo"/> | ||
| 24 | + <where> | ||
| 25 | + <if test="tableName != null and tableName != ''"> and table_name = #{tableName}</if> | ||
| 26 | + <if test="tableId != null and tableId != ''"> and table_id = #{tableId}</if> | ||
| 27 | + <if test="instanceId != null and instanceId != ''"> and instance_id = #{instanceId}</if> | ||
| 28 | + <if test="reply != null and reply != ''"> and reply = #{reply}</if> | ||
| 29 | + <if test="replyTime != null "> and reply_time = #{replyTime}</if> | ||
| 30 | + <if test="replyImg != null and replyImg != ''"> and reply_img = #{replyImg}</if> | ||
| 31 | + <if test="replyPeople != null and replyPeople != ''"> and reply_people = #{replyPeople}</if> | ||
| 32 | + </where> | ||
| 33 | + </select> | ||
| 34 | + | ||
| 35 | + <select id="selectReplyApprovalProcessById" parameterType="Long" resultMap="ReplyApprovalProcessResult"> | ||
| 36 | + <include refid="selectReplyApprovalProcessVo"/> | ||
| 37 | + where id = #{id} | ||
| 38 | + </select> | ||
| 39 | + | ||
| 40 | + <insert id="insertReplyApprovalProcess" parameterType="ReplyApprovalProcess" useGeneratedKeys="true" keyProperty="id"> | ||
| 41 | + insert into reply_approval_process | ||
| 42 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 43 | + <if test="tableName != null">table_name,</if> | ||
| 44 | + <if test="tableId != null">table_id,</if> | ||
| 45 | + <if test="instanceId != null">instance_id,</if> | ||
| 46 | + <if test="reply != null">reply,</if> | ||
| 47 | + <if test="replyTime != null">reply_time,</if> | ||
| 48 | + <if test="replyImg != null">reply_img,</if> | ||
| 49 | + <if test="replyPeople != null">reply_people,</if> | ||
| 50 | + </trim> | ||
| 51 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 52 | + <if test="tableName != null">#{tableName},</if> | ||
| 53 | + <if test="tableId != null">#{tableId},</if> | ||
| 54 | + <if test="instanceId != null">#{instanceId},</if> | ||
| 55 | + <if test="reply != null">#{reply},</if> | ||
| 56 | + <if test="replyTime != null">#{replyTime},</if> | ||
| 57 | + <if test="replyImg != null">#{replyImg},</if> | ||
| 58 | + <if test="replyPeople != null">#{replyPeople},</if> | ||
| 59 | + </trim> | ||
| 60 | + </insert> | ||
| 61 | + | ||
| 62 | + <update id="updateReplyApprovalProcess" parameterType="ReplyApprovalProcess"> | ||
| 63 | + update reply_approval_process | ||
| 64 | + <trim prefix="SET" suffixOverrides=","> | ||
| 65 | + <if test="tableName != null">table_name = #{tableName},</if> | ||
| 66 | + <if test="tableId != null">table_id = #{tableId},</if> | ||
| 67 | + <if test="instanceId != null">instance_id = #{instanceId},</if> | ||
| 68 | + <if test="reply != null">reply = #{reply},</if> | ||
| 69 | + <if test="replyTime != null">reply_time = #{replyTime},</if> | ||
| 70 | + <if test="replyImg != null">reply_img = #{replyImg},</if> | ||
| 71 | + <if test="replyPeople != null">reply_people = #{replyPeople},</if> | ||
| 72 | + </trim> | ||
| 73 | + where id = #{id} | ||
| 74 | + </update> | ||
| 75 | + | ||
| 76 | + <delete id="deleteReplyApprovalProcessById" parameterType="Long"> | ||
| 77 | + delete from reply_approval_process where id = #{id} | ||
| 78 | + </delete> | ||
| 79 | + | ||
| 80 | + <delete id="deleteReplyApprovalProcessByIds" parameterType="String"> | ||
| 81 | + delete from reply_approval_process where id in | ||
| 82 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 83 | + #{id} | ||
| 84 | + </foreach> | ||
| 85 | + </delete> | ||
| 86 | + | ||
| 87 | +</mapper> | ||
| 0 | \ No newline at end of file | 88 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.casefile.mapper.ViolationWarningInformationMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="ViolationWarningInformation" id="ViolationWarningInformationResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="number" column="number" /> | ||
| 10 | + <result property="violationObjectType" column="violation_object_type" /> | ||
| 11 | + <result property="owningRegion" column="owning_region" /> | ||
| 12 | + <result property="violationType" column="violation_type" /> | ||
| 13 | + <result property="violationGrade" column="violation_grade" /> | ||
| 14 | + <result property="projectName" column="project_name" /> | ||
| 15 | + <result property="companyName" column="company_name" /> | ||
| 16 | + <result property="describe" column="describe" /> | ||
| 17 | + <result property="sendObject" column="send_object" /> | ||
| 18 | + <result property="createTime" column="create_time" /> | ||
| 19 | + <result property="createBy" column="create_by" /> | ||
| 20 | + <result property="updateTime" column="update_time" /> | ||
| 21 | + <result property="updateBy" column="update_by" /> | ||
| 22 | + <result property="status" column="status" /> | ||
| 23 | + <result property="receive" column="receive" /> | ||
| 24 | + <result property="receiveStatus" column="receive_status" /> | ||
| 25 | + <result property="readBy" column="read_by" /> | ||
| 26 | + <result property="readTime" column="read_time" /> | ||
| 27 | + </resultMap> | ||
| 28 | + | ||
| 29 | + <sql id="selectViolationWarningInformationVo"> | ||
| 30 | + select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time from casefile_violation_warning_information | ||
| 31 | + </sql> | ||
| 32 | + | ||
| 33 | + <select id="selectViolationWarningInformationList" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult"> | ||
| 34 | + <include refid="selectViolationWarningInformationVo"/> | ||
| 35 | + <where> | ||
| 36 | + <if test="number != null and number != ''"> and `number` = #{number}</if> | ||
| 37 | + <if test="violationObjectType != null and violationObjectType != ''"> and violation_object_type = #{violationObjectType}</if> | ||
| 38 | + <if test="owningRegion != null and owningRegion != ''"> and owning_region = #{owningRegion}</if> | ||
| 39 | + <if test="violationType != null and violationType != ''"> and violation_type = #{violationType}</if> | ||
| 40 | + <if test="violationGrade != null and violationGrade != ''"> and violation_grade = #{violationGrade}</if> | ||
| 41 | + <if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if> | ||
| 42 | + <if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if> | ||
| 43 | + </where> | ||
| 44 | + </select> | ||
| 45 | + | ||
| 46 | + <select id="selectViolationWarningInformationById" parameterType="Long" resultMap="ViolationWarningInformationResult"> | ||
| 47 | + <include refid="selectViolationWarningInformationVo"/> | ||
| 48 | + where id = #{id} | ||
| 49 | + </select> | ||
| 50 | + | ||
| 51 | + <insert id="insertViolationWarningInformation" parameterType="ViolationWarningInformation" useGeneratedKeys="true" keyProperty="id"> | ||
| 52 | + insert into casefile_violation_warning_information | ||
| 53 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 54 | + create_time, | ||
| 55 | + <if test="number != null">`number`,</if> | ||
| 56 | + <if test="violationObjectType != null">violation_object_type,</if> | ||
| 57 | + <if test="owningRegion != null">owning_region,</if> | ||
| 58 | + <if test="violationType != null">violation_type,</if> | ||
| 59 | + <if test="violationGrade != null">violation_grade,</if> | ||
| 60 | + <if test="projectName != null">project_name,</if> | ||
| 61 | + <if test="companyName != null">company_name,</if> | ||
| 62 | + <if test="describe != null">`describe`,</if> | ||
| 63 | + <if test="sendObject != null">send_object,</if> | ||
| 64 | + <if test="createBy != null">create_by,</if> | ||
| 65 | + <if test="status != null">status,</if> | ||
| 66 | + </trim> | ||
| 67 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 68 | + now(), | ||
| 69 | + <if test="number != null">#{number},</if> | ||
| 70 | + <if test="violationObjectType != null">#{violationObjectType},</if> | ||
| 71 | + <if test="owningRegion != null">#{owningRegion},</if> | ||
| 72 | + <if test="violationType != null">#{violationType},</if> | ||
| 73 | + <if test="violationGrade != null">#{violationGrade},</if> | ||
| 74 | + <if test="projectName != null">#{projectName},</if> | ||
| 75 | + <if test="companyName != null">#{companyName},</if> | ||
| 76 | + <if test="describe != null">#{describe},</if> | ||
| 77 | + <if test="sendObject != null">#{sendObject},</if> | ||
| 78 | + <if test="createBy != null">#{createBy},</if> | ||
| 79 | + <if test="status != null">#{status},</if> | ||
| 80 | + </trim> | ||
| 81 | + </insert> | ||
| 82 | + | ||
| 83 | + <update id="updateViolationWarningInformation" parameterType="ViolationWarningInformation"> | ||
| 84 | + update casefile_violation_warning_information | ||
| 85 | + <trim prefix="SET" suffixOverrides=","> | ||
| 86 | + update_time = now(), | ||
| 87 | + <if test="number != null">`number` = #{number},</if> | ||
| 88 | + <if test="violationObjectType != null">violation_object_type = #{violationObjectType},</if> | ||
| 89 | + <if test="owningRegion != null">owning_region = #{owningRegion},</if> | ||
| 90 | + <if test="violationType != null">violation_type = #{violationType},</if> | ||
| 91 | + <if test="violationGrade != null">violation_grade = #{violationGrade},</if> | ||
| 92 | + <if test="projectName != null">project_name = #{projectName},</if> | ||
| 93 | + <if test="companyName != null">company_name = #{companyName},</if> | ||
| 94 | + <if test="describe != null">`describe` = #{describe},</if> | ||
| 95 | + <if test="sendObject != null">send_object = #{sendObject},</if> | ||
| 96 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 97 | + <if test="status != null">status = #{status},</if> | ||
| 98 | + <if test="receive != null">receive = #{receive},</if> | ||
| 99 | + <if test="receiveStatus != null">receive_status = #{receiveStatus},</if> | ||
| 100 | + <if test="readBy != null">read_by = #{readBy},</if> | ||
| 101 | + <if test="readTime != null">read_time = #{readTime},</if> | ||
| 102 | + </trim> | ||
| 103 | + where id = #{id} | ||
| 104 | + </update> | ||
| 105 | + | ||
| 106 | + <delete id="deleteViolationWarningInformationById" parameterType="Long"> | ||
| 107 | + delete from casefile_violation_warning_information where id = #{id} | ||
| 108 | + </delete> | ||
| 109 | + | ||
| 110 | + <delete id="deleteViolationWarningInformationByIds" parameterType="String"> | ||
| 111 | + delete from casefile_violation_warning_information where id in | ||
| 112 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 113 | + #{id} | ||
| 114 | + </foreach> | ||
| 115 | + </delete> | ||
| 116 | + | ||
| 117 | +</mapper> | ||
| 0 | \ No newline at end of file | 118 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/office/ConferenceMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.office.mapper.ConferenceMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="Conference" id="ConferenceResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="conferenceTime" column="conference_time" /> | ||
| 10 | + <result property="conferenceSite" column="conference_site" /> | ||
| 11 | + <result property="deptId" column="dept_id" /> | ||
| 12 | + <result property="deptName" column="dept_name" /> | ||
| 13 | + <result property="staff" column="staff" /> | ||
| 14 | + <result property="content" column="content" /> | ||
| 15 | + <result property="notify" column="notify" /> | ||
| 16 | + <result property="createTime" column="create_time" /> | ||
| 17 | + <result property="createBy" column="create_by" /> | ||
| 18 | + <result property="updateTime" column="update_time" /> | ||
| 19 | + <result property="updateBy" column="update_by" /> | ||
| 20 | + <result property="requirement" column="requirement" /> | ||
| 21 | + <result property="status" column="status" /> | ||
| 22 | + </resultMap> | ||
| 23 | + | ||
| 24 | + <sql id="selectConferenceVo"> | ||
| 25 | + select id, conference_time, conference_site, dept_id, dept_name, staff, content, notify, create_time, create_by, update_time, update_by,requirement,status from office_conference | ||
| 26 | + </sql> | ||
| 27 | + | ||
| 28 | + <select id="selectConferenceList" parameterType="Conference" resultMap="ConferenceResult"> | ||
| 29 | + <include refid="selectConferenceVo"/> | ||
| 30 | + <where> | ||
| 31 | + <if test="conferenceTime != null "> and conference_time = #{conferenceTime}</if> | ||
| 32 | + <if test="conferenceSite != null and conferenceSite != ''"> and conference_site = #{conferenceSite}</if> | ||
| 33 | + <if test="deptId != null "> and dept_id = #{deptId}</if> | ||
| 34 | + <if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if> | ||
| 35 | + <if test="staff != null and staff != ''"> and staff = #{staff}</if> | ||
| 36 | + <if test="content != null and content != ''"> and content = #{content}</if> | ||
| 37 | + <if test="notify != null "> and notify = #{notify}</if> | ||
| 38 | + </where> | ||
| 39 | + </select> | ||
| 40 | + | ||
| 41 | + <select id="selectConferenceById" parameterType="Long" resultMap="ConferenceResult"> | ||
| 42 | + <include refid="selectConferenceVo"/> | ||
| 43 | + where id = #{id} | ||
| 44 | + </select> | ||
| 45 | + | ||
| 46 | + <insert id="insertConference" parameterType="Conference" useGeneratedKeys="true" keyProperty="id"> | ||
| 47 | + insert into office_conference | ||
| 48 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 49 | + create_time, | ||
| 50 | + <if test="conferenceTime != null">conference_time,</if> | ||
| 51 | + <if test="conferenceSite != null and conferenceSite != ''">conference_site,</if> | ||
| 52 | + <if test="deptId != null">dept_id,</if> | ||
| 53 | + <if test="deptName != null and deptName != ''">dept_name,</if> | ||
| 54 | + <if test="staff != null and staff != ''">staff,</if> | ||
| 55 | + <if test="subject != null and subject != ''">subject,</if> | ||
| 56 | + <if test="content != null">content,</if> | ||
| 57 | + <if test="notify != null">notify,</if> | ||
| 58 | + <if test="createBy != null">create_by,</if> | ||
| 59 | + <if test="requirement != null">requirement,</if> | ||
| 60 | + <if test="status != null">status,</if> | ||
| 61 | + </trim> | ||
| 62 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 63 | + now(), | ||
| 64 | + <if test="conferenceTime != null">#{conferenceTime},</if> | ||
| 65 | + <if test="conferenceSite != null and conferenceSite != ''">#{conferenceSite},</if> | ||
| 66 | + <if test="deptId != null">#{deptId},</if> | ||
| 67 | + <if test="deptName != null and deptName != ''">#{deptName},</if> | ||
| 68 | + <if test="staff != null and staff != ''">#{staff},</if> | ||
| 69 | + <if test="subject != null and subject != ''">#{subject},</if> | ||
| 70 | + <if test="content != null">#{content},</if> | ||
| 71 | + <if test="notify != null">#{notify},</if> | ||
| 72 | + <if test="createBy != null">#{createBy},</if> | ||
| 73 | + <if test="requirement != null">#{requirement},</if> | ||
| 74 | + <if test="status != null">#{status},</if> | ||
| 75 | + </trim> | ||
| 76 | + </insert> | ||
| 77 | + | ||
| 78 | + <update id="updateConference" parameterType="Conference"> | ||
| 79 | + update office_conference | ||
| 80 | + <trim prefix="SET" suffixOverrides=","> | ||
| 81 | + update_time = now(), | ||
| 82 | + <if test="conferenceTime != null">conference_time = #{conferenceTime},</if> | ||
| 83 | + <if test="conferenceSite != null and conferenceSite != ''">conference_site = #{conferenceSite},</if> | ||
| 84 | + <if test="deptId != null">dept_id = #{deptId},</if> | ||
| 85 | + <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if> | ||
| 86 | + <if test="staff != null and staff != ''">staff = #{staff},</if> | ||
| 87 | + <if test="subject != null and subject != ''">subject = #{subject},</if> | ||
| 88 | + <if test="content != null">content = #{content},</if> | ||
| 89 | + <if test="notify != null">notify = #{notify},</if> | ||
| 90 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 91 | + <if test="requirement != null">requirement = #{requirement},</if> | ||
| 92 | + <if test="status != null">status = #{status},</if> | ||
| 93 | + </trim> | ||
| 94 | + where id = #{id} | ||
| 95 | + </update> | ||
| 96 | + | ||
| 97 | + <delete id="deleteConferenceById" parameterType="Long"> | ||
| 98 | + delete from office_conference where id = #{id} | ||
| 99 | + </delete> | ||
| 100 | + | ||
| 101 | + <delete id="deleteConferenceByIds" parameterType="String"> | ||
| 102 | + delete from office_conference where id in | ||
| 103 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 104 | + #{id} | ||
| 105 | + </foreach> | ||
| 106 | + </delete> | ||
| 107 | + | ||
| 108 | +</mapper> | ||
| 0 | \ No newline at end of file | 109 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/ContractManagementMapper.xml renamed to trash-workFlow/src/main/resources/mapper/office/ContractManagementMapper.xml
| @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 16 | <result property="contractState" column="contract_state" /> | 16 | <result property="contractState" column="contract_state" /> |
| 17 | <result property="deptid" column="deptId" /> | 17 | <result property="deptid" column="deptId" /> |
| 18 | <result property="deptname" column="deptName" /> | 18 | <result property="deptname" column="deptName" /> |
| 19 | + <result property="status" column="status" /> | ||
| 19 | <result property="updateBy" column="update_by" /> | 20 | <result property="updateBy" column="update_by" /> |
| 20 | <result property="updateTime" column="update_time" /> | 21 | <result property="updateTime" column="update_time" /> |
| 21 | <result property="createBy" column="create_by" /> | 22 | <result property="createBy" column="create_by" /> |
| @@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 23 | </resultMap> | 24 | </resultMap> |
| 24 | 25 | ||
| 25 | <sql id="selectContractManagementVo"> | 26 | <sql id="selectContractManagementVo"> |
| 26 | - select id, contract_number, contract_name, first_party, second_party, contract_begin_date, contract_end_date, contract_money, contract_state, deptId, deptName from contract_management | 27 | + select id, contract_number, contract_name, first_party, second_party, contract_begin_date, contract_end_date, contract_money, contract_state, deptId, deptName,status from office_contract_management |
| 27 | </sql> | 28 | </sql> |
| 28 | 29 | ||
| 29 | <select id="selectContractManagementList" parameterType="ContractManagement" resultMap="ContractManagementResult"> | 30 | <select id="selectContractManagementList" parameterType="ContractManagement" resultMap="ContractManagementResult"> |
| @@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 39 | <if test="contractState != null and contractState != ''"> and contract_state = #{contractState}</if> | 40 | <if test="contractState != null and contractState != ''"> and contract_state = #{contractState}</if> |
| 40 | <if test="deptid != null "> and deptId = #{deptid}</if> | 41 | <if test="deptid != null "> and deptId = #{deptid}</if> |
| 41 | <if test="deptname != null and deptname != ''"> and deptName like concat('%', #{deptname}, '%')</if> | 42 | <if test="deptname != null and deptname != ''"> and deptName like concat('%', #{deptname}, '%')</if> |
| 43 | + <if test="status != null and status != ''"> and status = #{status}</if> | ||
| 42 | </where> | 44 | </where> |
| 43 | </select> | 45 | </select> |
| 44 | 46 | ||
| @@ -48,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -48,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 48 | </select> | 50 | </select> |
| 49 | 51 | ||
| 50 | <insert id="insertContractManagement" parameterType="ContractManagement" useGeneratedKeys="true" keyProperty="id"> | 52 | <insert id="insertContractManagement" parameterType="ContractManagement" useGeneratedKeys="true" keyProperty="id"> |
| 51 | - insert into contract_management | 53 | + insert into office_contract_management |
| 52 | <trim prefix="(" suffix=")" suffixOverrides=","> | 54 | <trim prefix="(" suffix=")" suffixOverrides=","> |
| 53 | create_time, | 55 | create_time, |
| 54 | <if test="contractNumber != null">contract_number,</if> | 56 | <if test="contractNumber != null">contract_number,</if> |
| @@ -61,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -61,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 61 | <if test="contractState != null">contract_state,</if> | 63 | <if test="contractState != null">contract_state,</if> |
| 62 | <if test="deptid != null">deptId,</if> | 64 | <if test="deptid != null">deptId,</if> |
| 63 | <if test="deptname != null">deptName,</if> | 65 | <if test="deptname != null">deptName,</if> |
| 66 | + <if test="status != null">status,</if> | ||
| 67 | + <if test="createBy != null">create_by,</if> | ||
| 64 | </trim> | 68 | </trim> |
| 65 | <trim prefix="values (" suffix=")" suffixOverrides=","> | 69 | <trim prefix="values (" suffix=")" suffixOverrides=","> |
| 66 | now(), | 70 | now(), |
| @@ -74,12 +78,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -74,12 +78,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 74 | <if test="contractState != null">#{contractState},</if> | 78 | <if test="contractState != null">#{contractState},</if> |
| 75 | <if test="deptid != null">#{deptid},</if> | 79 | <if test="deptid != null">#{deptid},</if> |
| 76 | <if test="deptname != null">#{deptname},</if> | 80 | <if test="deptname != null">#{deptname},</if> |
| 81 | + <if test="status != null">#{status},</if> | ||
| 82 | + <if test="createBy != null">#{createBy},</if> | ||
| 77 | </trim> | 83 | </trim> |
| 78 | </insert> | 84 | </insert> |
| 79 | 85 | ||
| 80 | <update id="updateContractManagement" parameterType="ContractManagement"> | 86 | <update id="updateContractManagement" parameterType="ContractManagement"> |
| 81 | - update contract_management | 87 | + update office_contract_management |
| 82 | <trim prefix="SET" suffixOverrides=","> | 88 | <trim prefix="SET" suffixOverrides=","> |
| 89 | + update_time = now(), | ||
| 83 | <if test="contractNumber != null">contract_number = #{contractNumber},</if> | 90 | <if test="contractNumber != null">contract_number = #{contractNumber},</if> |
| 84 | <if test="contractName != null">contract_name = #{contractName},</if> | 91 | <if test="contractName != null">contract_name = #{contractName},</if> |
| 85 | <if test="firstParty != null">first_party = #{firstParty},</if> | 92 | <if test="firstParty != null">first_party = #{firstParty},</if> |
| @@ -90,17 +97,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -90,17 +97,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 90 | <if test="contractState != null">contract_state = #{contractState},</if> | 97 | <if test="contractState != null">contract_state = #{contractState},</if> |
| 91 | <if test="deptid != null">deptId = #{deptid},</if> | 98 | <if test="deptid != null">deptId = #{deptid},</if> |
| 92 | <if test="deptname != null">deptName = #{deptname},</if> | 99 | <if test="deptname != null">deptName = #{deptname},</if> |
| 93 | - update_time = now(), | 100 | + <if test="status != null">status = #{status},</if> |
| 101 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 94 | </trim> | 102 | </trim> |
| 95 | where id = #{id} | 103 | where id = #{id} |
| 96 | </update> | 104 | </update> |
| 97 | 105 | ||
| 98 | <delete id="deleteContractManagementById" parameterType="Long"> | 106 | <delete id="deleteContractManagementById" parameterType="Long"> |
| 99 | - delete from contract_management where id = #{id} | 107 | + delete from office_contract_management where id = #{id} |
| 100 | </delete> | 108 | </delete> |
| 101 | 109 | ||
| 102 | <delete id="deleteContractManagementByIds" parameterType="String"> | 110 | <delete id="deleteContractManagementByIds" parameterType="String"> |
| 103 | - delete from contract_management where id in | 111 | + delete from office_contract_management where id in |
| 104 | <foreach item="id" collection="array" open="(" separator="," close=")"> | 112 | <foreach item="id" collection="array" open="(" separator="," close=")"> |
| 105 | #{id} | 113 | #{id} |
| 106 | </foreach> | 114 | </foreach> |
trash-workFlow/src/main/resources/mapper/office/HandleAffairsMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.office.mapper.HandleAffairsMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="HandleAffairs" id="HandleAffairsResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="company" column="company" /> | ||
| 10 | + <result property="receiveTime" column="receive_time" /> | ||
| 11 | + <result property="title" column="title" /> | ||
| 12 | + <result property="type" column="type" /> | ||
| 13 | + <result property="appeal" column="appeal" /> | ||
| 14 | + <result property="sendPerson" column="send_person" /> | ||
| 15 | + <result property="sendDate" column="send_date" /> | ||
| 16 | + <result property="isRead" column="is_read" /> | ||
| 17 | + <result property="opinion" column="opinion" /> | ||
| 18 | + <result property="deptOpinion" column="dept_opinion" /> | ||
| 19 | + <result property="status" column="status" /> | ||
| 20 | + <result property="createTime" column="create_time" /> | ||
| 21 | + <result property="createBy" column="create_by" /> | ||
| 22 | + <result property="updateTime" column="update_time" /> | ||
| 23 | + <result property="updateBy" column="update_by" /> | ||
| 24 | + </resultMap> | ||
| 25 | + | ||
| 26 | + <sql id="selectHandleAffairsVo"> | ||
| 27 | + select id, company, receive_time, title, type, appeal, send_person,send_date, is_read, opinion, dept_opinion, status, create_time, create_by, update_time, update_by from office_handle_affairs | ||
| 28 | + </sql> | ||
| 29 | + | ||
| 30 | + <select id="selectHandleAffairsList" parameterType="HandleAffairs" resultMap="HandleAffairsResult"> | ||
| 31 | + <include refid="selectHandleAffairsVo"/> | ||
| 32 | + <where> | ||
| 33 | + <if test="company != null and company != ''"> and company = #{company}</if> | ||
| 34 | + <if test="receiveTime != null "> and receive_time = #{receiveTime}</if> | ||
| 35 | + <if test="title != null and title != ''"> and title = #{title}</if> | ||
| 36 | + <if test="type != null and type != ''"> and type = #{type}</if> | ||
| 37 | + <if test="appeal != null and appeal != ''"> and appeal = #{appeal}</if> | ||
| 38 | + <if test="sendPerson != null and sendPerson != ''"> and send_person = #{sendPerson}</if> | ||
| 39 | + <if test="status != null "> and status = #{status}</if> | ||
| 40 | + </where> | ||
| 41 | + </select> | ||
| 42 | + | ||
| 43 | + <select id="selectHandleAffairsById" parameterType="Long" resultMap="HandleAffairsResult"> | ||
| 44 | + <include refid="selectHandleAffairsVo"/> | ||
| 45 | + where id = #{id} | ||
| 46 | + </select> | ||
| 47 | + | ||
| 48 | + <insert id="insertHandleAffairs" parameterType="HandleAffairs" useGeneratedKeys="true" keyProperty="id"> | ||
| 49 | + insert into office_handle_affairs | ||
| 50 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 51 | + create_time, | ||
| 52 | + <if test="company != null">company,</if> | ||
| 53 | + <if test="receiveTime != null">receive_time,</if> | ||
| 54 | + <if test="title != null">title,</if> | ||
| 55 | + <if test="type != null">`type`,</if> | ||
| 56 | + <if test="appeal != null">appeal,</if> | ||
| 57 | + <if test="sendPerson != null">send_person,</if> | ||
| 58 | + <if test="sendDate != null">send_date,</if> | ||
| 59 | + <if test="isRead != null">is_read,</if> | ||
| 60 | + <if test="opinion != null">opinion,</if> | ||
| 61 | + <if test="deptOpinion != null">dept_opinion,</if> | ||
| 62 | + <if test="status != null">status,</if> | ||
| 63 | + <if test="createBy != null">create_by,</if> | ||
| 64 | + </trim> | ||
| 65 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 66 | + now(), | ||
| 67 | + <if test="company != null">#{company},</if> | ||
| 68 | + <if test="receiveTime != null">#{receiveTime},</if> | ||
| 69 | + <if test="title != null">#{title},</if> | ||
| 70 | + <if test="type != null">#{type},</if> | ||
| 71 | + <if test="appeal != null">#{appeal},</if> | ||
| 72 | + <if test="sendPerson != null">#{sendPerson},</if> | ||
| 73 | + <if test="sendDate != null">#{sendDate},</if> | ||
| 74 | + <if test="isRead != null">#{isRead},</if> | ||
| 75 | + <if test="opinion != null">#{opinion},</if> | ||
| 76 | + <if test="deptOpinion != null">#{deptOpinion},</if> | ||
| 77 | + <if test="status != null">#{status},</if> | ||
| 78 | + <if test="createBy != null">#{createBy},</if> | ||
| 79 | + </trim> | ||
| 80 | + </insert> | ||
| 81 | + | ||
| 82 | + <update id="updateHandleAffairs" parameterType="HandleAffairs"> | ||
| 83 | + update office_handle_affairs | ||
| 84 | + <trim prefix="SET" suffixOverrides=","> | ||
| 85 | + update_time = now(), | ||
| 86 | + <if test="company != null">company = #{company},</if> | ||
| 87 | + <if test="receiveTime != null">receive_time = #{receiveTime},</if> | ||
| 88 | + <if test="title != null">title = #{title},</if> | ||
| 89 | + <if test="type != null">`type` = #{type},</if> | ||
| 90 | + <if test="appeal != null">appeal = #{appeal},</if> | ||
| 91 | + <if test="sendPerson != null">send_person = #{sendPerson},</if> | ||
| 92 | + <if test="sendDate != null">send_date = #{sendDate},</if> | ||
| 93 | + <if test="isRead != null">is_read = #{isRead},</if> | ||
| 94 | + <if test="opinion != null">opinion = #{opinion},</if> | ||
| 95 | + <if test="deptOpinion != null">dept_opinion = #{deptOpinion},</if> | ||
| 96 | + <if test="status != null">status = #{status},</if> | ||
| 97 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 98 | + </trim> | ||
| 99 | + where id = #{id} | ||
| 100 | + </update> | ||
| 101 | + | ||
| 102 | + <delete id="deleteHandleAffairsById" parameterType="Long"> | ||
| 103 | + delete from office_handle_affairs where id = #{id} | ||
| 104 | + </delete> | ||
| 105 | + | ||
| 106 | + <delete id="deleteHandleAffairsByIds" parameterType="String"> | ||
| 107 | + delete from office_handle_affairs where id in | ||
| 108 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 109 | + #{id} | ||
| 110 | + </foreach> | ||
| 111 | + </delete> | ||
| 112 | + | ||
| 113 | +</mapper> | ||
| 0 | \ No newline at end of file | 114 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/office/LeaveApplicationMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.office.mapper.LeaveApplicationMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="LeaveApplication" id="LeaveApplicationResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="applicant" column="applicant" /> | ||
| 10 | + <result property="deptId" column="dept_Id" /> | ||
| 11 | + <result property="positionId" column="position_id" /> | ||
| 12 | + <result property="phone" column="phone" /> | ||
| 13 | + <result property="type" column="type" /> | ||
| 14 | + <result property="beginDate" column="begin_date" /> | ||
| 15 | + <result property="endDate" column="end_date" /> | ||
| 16 | + <result property="numberDays" column="number_days" /> | ||
| 17 | + <result property="content" column="content" /> | ||
| 18 | + <result property="status" column="status" /> | ||
| 19 | + <result property="createTime" column="create_time" /> | ||
| 20 | + <result property="createBy" column="create_by" /> | ||
| 21 | + <result property="updateTime" column="update_time" /> | ||
| 22 | + <result property="updateBy" column="update_by" /> | ||
| 23 | + </resultMap> | ||
| 24 | + | ||
| 25 | + <sql id="selectLeaveApplicationVo"> | ||
| 26 | + select id, applicant, dept_Id, position_id, phone, type, begin_date, end_date, number_days, content, status, create_time, create_by, update_time, update_by from office_leave_application | ||
| 27 | + </sql> | ||
| 28 | + | ||
| 29 | + <select id="selectLeaveApplicationList" parameterType="LeaveApplication" resultMap="LeaveApplicationResult"> | ||
| 30 | + <include refid="selectLeaveApplicationVo"/> | ||
| 31 | + <where> | ||
| 32 | + <if test="applicant != null and applicant != ''"> and applicant like concat('%', #{applicant}, '%')</if> | ||
| 33 | + <if test="deptId != null "> and dept_Id = #{deptId}</if> | ||
| 34 | + <if test="positionId != null "> and position_id = #{positionId}</if> | ||
| 35 | + <if test="type != null and type != ''"> and type = #{type}</if> | ||
| 36 | + </where> | ||
| 37 | + </select> | ||
| 38 | + | ||
| 39 | + <select id="selectLeaveApplicationById" parameterType="Long" resultMap="LeaveApplicationResult"> | ||
| 40 | + <include refid="selectLeaveApplicationVo"/> | ||
| 41 | + where id = #{id} | ||
| 42 | + </select> | ||
| 43 | + | ||
| 44 | + <insert id="insertLeaveApplication" parameterType="LeaveApplication" useGeneratedKeys="true" keyProperty="id"> | ||
| 45 | + insert into office_leave_application | ||
| 46 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 47 | + create_time, | ||
| 48 | + <if test="applicant != null">applicant,</if> | ||
| 49 | + <if test="deptId != null">dept_Id,</if> | ||
| 50 | + <if test="positionId != null">position_id,</if> | ||
| 51 | + <if test="phone != null">phone,</if> | ||
| 52 | + <if test="type != null">type,</if> | ||
| 53 | + <if test="beginDate != null">begin_date,</if> | ||
| 54 | + <if test="endDate != null">end_date,</if> | ||
| 55 | + <if test="numberDays != null">number_days,</if> | ||
| 56 | + <if test="content != null">content,</if> | ||
| 57 | + <if test="status != null">status,</if> | ||
| 58 | + <if test="createBy != null">create_by,</if> | ||
| 59 | + </trim> | ||
| 60 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 61 | + now(), | ||
| 62 | + <if test="applicant != null">#{applicant},</if> | ||
| 63 | + <if test="deptId != null">#{deptId},</if> | ||
| 64 | + <if test="positionId != null">#{positionId},</if> | ||
| 65 | + <if test="phone != null">#{phone},</if> | ||
| 66 | + <if test="type != null">#{type},</if> | ||
| 67 | + <if test="beginDate != null">#{beginDate},</if> | ||
| 68 | + <if test="endDate != null">#{endDate},</if> | ||
| 69 | + <if test="numberDays != null">#{numberDays},</if> | ||
| 70 | + <if test="content != null">#{content},</if> | ||
| 71 | + <if test="status != null">#{status},</if> | ||
| 72 | + <if test="createBy != null">#{createBy},</if> | ||
| 73 | + </trim> | ||
| 74 | + </insert> | ||
| 75 | + | ||
| 76 | + <update id="updateLeaveApplication" parameterType="LeaveApplication"> | ||
| 77 | + update office_leave_application | ||
| 78 | + <trim prefix="SET" suffixOverrides=","> | ||
| 79 | + update_time = now(), | ||
| 80 | + <if test="applicant != null">applicant = #{applicant},</if> | ||
| 81 | + <if test="deptId != null">dept_Id = #{deptId},</if> | ||
| 82 | + <if test="positionId != null">position_id = #{positionId},</if> | ||
| 83 | + <if test="phone != null">phone = #{phone},</if> | ||
| 84 | + <if test="type != null">type = #{type},</if> | ||
| 85 | + <if test="beginDate != null">begin_date = #{beginDate},</if> | ||
| 86 | + <if test="endDate != null">end_date = #{endDate},</if> | ||
| 87 | + <if test="numberDays != null">number_days = #{numberDays},</if> | ||
| 88 | + <if test="content != null">content = #{content},</if> | ||
| 89 | + <if test="status != null">status = #{status},</if> | ||
| 90 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 91 | + </trim> | ||
| 92 | + where id = #{id} | ||
| 93 | + </update> | ||
| 94 | + | ||
| 95 | + <delete id="deleteLeaveApplicationById" parameterType="Long"> | ||
| 96 | + delete from office_leave_application where id = #{id} | ||
| 97 | + </delete> | ||
| 98 | + | ||
| 99 | + <delete id="deleteLeaveApplicationByIds" parameterType="String"> | ||
| 100 | + delete from office_leave_application where id in | ||
| 101 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 102 | + #{id} | ||
| 103 | + </foreach> | ||
| 104 | + </delete> | ||
| 105 | + | ||
| 106 | +</mapper> | ||
| 0 | \ No newline at end of file | 107 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/office/LogisticsManagementMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper | ||
| 3 | +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 4 | +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 5 | +<mapper namespace="com.trash.office.mapper.LogisticsManagementMapper"> | ||
| 6 | + | ||
| 7 | + <resultMap type="LogisticsManagement" id="LogisticsManagementResult"> | ||
| 8 | + <result property="id" column="id" /> | ||
| 9 | + <result property="type" column="type" /> | ||
| 10 | + <result property="deptId" column="dept_id" /> | ||
| 11 | + <result property="sealType" column="seal_type" /> | ||
| 12 | + <result property="sealUpdateTime" column="seal_update_time" /> | ||
| 13 | + <result property="sealEndTime" column="seal_end_time" /> | ||
| 14 | + <result property="purpose" column="purpose" /> | ||
| 15 | + <result property="staff" column="staff" /> | ||
| 16 | + <result property="useDate" column="use_date" /> | ||
| 17 | + <result property="goodsName" column="goods_name" /> | ||
| 18 | + <result property="quantity" column="quantity" /> | ||
| 19 | + <result property="status" column="status" /> | ||
| 20 | + <result property="createTime" column="create_time" /> | ||
| 21 | + <result property="createBy" column="create_by" /> | ||
| 22 | + <result property="updateTime" column="update_time" /> | ||
| 23 | + <result property="updateBy" column="update_by" /> | ||
| 24 | + </resultMap> | ||
| 25 | + | ||
| 26 | + <sql id="selectLogisticsManagementVo"> | ||
| 27 | + select id, type, dept_id, seal_type, seal_update_time, seal_end_time, purpose, staff, use_date, goods_name, quantity, status, create_time, create_by, update_time, update_by from office_logistics_management | ||
| 28 | + </sql> | ||
| 29 | + | ||
| 30 | + <select id="selectLogisticsManagementList" parameterType="LogisticsManagement" resultMap="LogisticsManagementResult"> | ||
| 31 | + <include refid="selectLogisticsManagementVo"/> | ||
| 32 | + <where> | ||
| 33 | + <if test="type != null "> and type = #{type}</if> | ||
| 34 | + <if test="deptId != null "> and dept_id = #{deptId}</if> | ||
| 35 | + <if test="sealType != null and sealType != ''"> and seal_type = #{sealType}</if> | ||
| 36 | + <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if> | ||
| 37 | + <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if> | ||
| 38 | + <if test="purpose != null and purpose != ''"> and purpose = #{purpose}</if> | ||
| 39 | + <if test="staff != null and staff != ''"> and staff = #{staff}</if> | ||
| 40 | + <if test="useDate != null "> and use_date = #{useDate}</if> | ||
| 41 | + <if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if> | ||
| 42 | + <if test="quantity != null "> and quantity = #{quantity}</if> | ||
| 43 | + <if test="status != null "> and status = #{status}</if> | ||
| 44 | + </where> | ||
| 45 | + </select> | ||
| 46 | + | ||
| 47 | + <select id="selectLogisticsManagementById" parameterType="Long" resultMap="LogisticsManagementResult"> | ||
| 48 | + <include refid="selectLogisticsManagementVo"/> | ||
| 49 | + where id = #{id} | ||
| 50 | + </select> | ||
| 51 | + | ||
| 52 | + <insert id="insertLogisticsManagement" parameterType="LogisticsManagement" useGeneratedKeys="true" keyProperty="id"> | ||
| 53 | + insert into office_logistics_management | ||
| 54 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
| 55 | + create_time, | ||
| 56 | + <if test="type != null">type,</if> | ||
| 57 | + <if test="deptId != null">dept_id,</if> | ||
| 58 | + <if test="sealType != null">seal_type,</if> | ||
| 59 | + <if test="sealUpdateTime != null">seal_update_time,</if> | ||
| 60 | + <if test="sealEndTime != null">seal_end_time,</if> | ||
| 61 | + <if test="purpose != null">purpose,</if> | ||
| 62 | + <if test="staff != null">staff,</if> | ||
| 63 | + <if test="useDate != null">use_date,</if> | ||
| 64 | + <if test="goodsName != null">goods_name,</if> | ||
| 65 | + <if test="quantity != null">quantity,</if> | ||
| 66 | + <if test="status != null">status,</if> | ||
| 67 | + <if test="createBy != null">create_by,</if> | ||
| 68 | + </trim> | ||
| 69 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
| 70 | + now(), | ||
| 71 | + <if test="type != null">#{type},</if> | ||
| 72 | + <if test="deptId != null">#{deptId},</if> | ||
| 73 | + <if test="sealType != null">#{sealType},</if> | ||
| 74 | + <if test="sealUpdateTime != null">#{sealUpdateTime},</if> | ||
| 75 | + <if test="sealEndTime != null">#{sealEndTime},</if> | ||
| 76 | + <if test="purpose != null">#{purpose},</if> | ||
| 77 | + <if test="staff != null">#{staff},</if> | ||
| 78 | + <if test="useDate != null">#{useDate},</if> | ||
| 79 | + <if test="goodsName != null">#{goodsName},</if> | ||
| 80 | + <if test="quantity != null">#{quantity},</if> | ||
| 81 | + <if test="status != null">#{status},</if> | ||
| 82 | + <if test="createBy != null">#{createBy},</if> | ||
| 83 | + </trim> | ||
| 84 | + </insert> | ||
| 85 | + | ||
| 86 | + <update id="updateLogisticsManagement" parameterType="LogisticsManagement"> | ||
| 87 | + update office_logistics_management | ||
| 88 | + <trim prefix="SET" suffixOverrides=","> | ||
| 89 | + update_time = now(), | ||
| 90 | + <if test="type != null">type = #{type},</if> | ||
| 91 | + <if test="deptId != null">dept_id = #{deptId},</if> | ||
| 92 | + <if test="sealType != null">seal_type = #{sealType},</if> | ||
| 93 | + <if test="sealUpdateTime != null">seal_update_time = #{sealUpdateTime},</if> | ||
| 94 | + <if test="sealEndTime != null">seal_end_time = #{sealEndTime},</if> | ||
| 95 | + <if test="purpose != null">purpose = #{purpose},</if> | ||
| 96 | + <if test="staff != null">staff = #{staff},</if> | ||
| 97 | + <if test="useDate != null">use_date = #{useDate},</if> | ||
| 98 | + <if test="goodsName != null">goods_name = #{goodsName},</if> | ||
| 99 | + <if test="quantity != null">quantity = #{quantity},</if> | ||
| 100 | + <if test="status != null">status = #{status},</if> | ||
| 101 | + <if test="updateBy != null">update_by = #{updateBy},</if> | ||
| 102 | + </trim> | ||
| 103 | + where id = #{id} | ||
| 104 | + </update> | ||
| 105 | + | ||
| 106 | + <delete id="deleteLogisticsManagementById" parameterType="Long"> | ||
| 107 | + delete from office_logistics_management where id = #{id} | ||
| 108 | + </delete> | ||
| 109 | + | ||
| 110 | + <delete id="deleteLogisticsManagementByIds" parameterType="String"> | ||
| 111 | + delete from office_logistics_management where id in | ||
| 112 | + <foreach item="id" collection="array" open="(" separator="," close=")"> | ||
| 113 | + #{id} | ||
| 114 | + </foreach> | ||
| 115 | + </delete> | ||
| 116 | + | ||
| 117 | +</mapper> | ||
| 0 | \ No newline at end of file | 118 | \ No newline at end of file |
trash-workFlow/src/main/resources/mapper/UploadFileMapper.xml renamed to trash-workFlow/src/main/resources/mapper/office/UploadFileMapper.xml