From 2cef960a30ba36e43247de4fab79e520c5285d02 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 30 Aug 2023 00:45:08 +0800 Subject: [PATCH] update code --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 +- .../common/utils/file/FileUploadUtils.java | 6 + ruoyi-ui/src/api/project/costOutput.js | 24 ++ ruoyi-ui/src/styles/index.scss | 1 + .../views/project/costOutput/costMonth.vue | 49 ++++ .../project/costOutput/costOutputDrawer.vue | 266 ++++++++++-------- .../src/views/project/costOutput/costYear.vue | 46 +++ .../src/views/project/surProject/myIndex.vue | 2 +- ruoyi-ui/vue.config.js | 4 +- .../SurProjectCostOutputController.java | 47 ++++ .../service/ISurProjectCostOutputService.java | 10 + .../impl/SurProjectCostOutputServiceImpl.java | 62 ++++ 12 files changed, 393 insertions(+), 126 deletions(-) create mode 100644 ruoyi-ui/src/views/project/costOutput/costMonth.vue create mode 100644 ruoyi-ui/src/views/project/costOutput/costYear.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 00465637..300fbf3f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -32,6 +32,6 @@ public class RuoYiApplication " | | \\ `' /| `-' / \n" + " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); - //FileUploadUtils.minPath("/data/uploadPath/upload/2023/08/16"); + //FileUploadUtils.minPath("/data/uploadPath/upload/"); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 992c9837..b54dd6cb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -134,6 +134,8 @@ public class FileUploadUtils ImgUtil.scale(FileUtil.file(absPath), FileUtil.file(absPath), (float) (2000.0 / w)); } + ImgUtil.scale(FileUtil.file(absPath), + FileUtil.file(absPath + ".1000.jpg"), (float) (1000.0 / w)); ImgUtil.scale(FileUtil.file(absPath), FileUtil.file(absPath + ".min.jpg"), (float) (300.0 / w)); } @@ -146,6 +148,10 @@ public class FileUploadUtils public static void minPath(String path){ List list= FileUtil.loopFiles(path); for(File f :list){ + String p=f.getAbsolutePath().toLowerCase(); + if(p.endsWith(".min.jpg")||p.endsWith(".1000.jpg")){ + continue; + } System.out.println(f.getAbsolutePath()); makeMiniImage(f.getAbsolutePath()); } diff --git a/ruoyi-ui/src/api/project/costOutput.js b/ruoyi-ui/src/api/project/costOutput.js index e635d1cf..fa58083e 100644 --- a/ruoyi-ui/src/api/project/costOutput.js +++ b/ruoyi-ui/src/api/project/costOutput.js @@ -42,3 +42,27 @@ export function delCostOutput(id) { method: 'delete' }) } + + +export function listByProjectId(projectId){ + return request({ + url: '/project/costOutput/listByProjectId?projectId=' + projectId, + method: 'get' + }) +} + +export function addYearInvestment(data){ + return request({ + url: '/project/costOutput/addYearInvestment', + method: 'post', + data:data + }) +} + +export function addMonthInvestment(data){ + return request({ + url: '/project/costOutput/addMonthInvestment', + method: 'post', + data:data + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/styles/index.scss b/ruoyi-ui/src/styles/index.scss index 72a64249..8b7102a9 100644 --- a/ruoyi-ui/src/styles/index.scss +++ b/ruoyi-ui/src/styles/index.scss @@ -139,3 +139,4 @@ input, textarea{ .el-upload__tip{ line-height: 1.2; } + diff --git a/ruoyi-ui/src/views/project/costOutput/costMonth.vue b/ruoyi-ui/src/views/project/costOutput/costMonth.vue new file mode 100644 index 00000000..f6c3869f --- /dev/null +++ b/ruoyi-ui/src/views/project/costOutput/costMonth.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue index 3554eb14..43c1d449 100644 --- a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue +++ b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue @@ -1,152 +1,151 @@ + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue index 90df0166..51858aca 100644 --- a/ruoyi-ui/src/views/project/surProject/myIndex.vue +++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue @@ -239,7 +239,7 @@ export default { loadData() { let queryParams = { pageNum: 1, - pageSize: 40, + pageSize:500, }; listSurProject(queryParams).then((d) => { this.prjs = d.rows || []; diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f348640d..8e9aa86a 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -41,8 +41,8 @@ module.exports = { } }, '/jhapi':{ - target: `http://62.234.3.186/jhapi/`, - //target: `http://127.0.0.1:8090/jhapi/`, + //target: `http://62.234.3.186/jhapi/`, + target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/' diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java index 9b9b092b..f04f1f63 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java @@ -102,4 +102,51 @@ public class SurProjectCostOutputController extends BaseController { return toAjax(surProjectCostOutputService.deleteSurProjectCostOutputByIds(ids)); } + + /** + * 按项目ID查询，如果没有数据进行初始化 + * @param projectId + * @return + */ + @GetMapping("/listByProjectId") + public AjaxResult listByProjectId(long projectId){ + SurProjectCostOutput where =new SurProjectCostOutput(); + where.setProjectId(projectId); + List list=surProjectCostOutputService.selectSurProjectCostOutputList(where); + if(list.size()==0){ + surProjectCostOutputService.initProject(projectId); + } + list=surProjectCostOutputService.selectSurProjectCostOutputList(where); + return AjaxResult.success(list); + } + + /** + * 增加年度投资 + * @param projectId + * @param year + * @return + */ + @PostMapping("/addYearInvestment") + public AjaxResult addYearInvestment(@RequestBody SurProjectCostOutput where){ + List list=surProjectCostOutputService.selectSurProjectCostOutputList(where); + if(list.size()==0){ + surProjectCostOutputService.addYearInvestment(where); + return AjaxResult.success("增加年度投资成功!"); + }else{ + return AjaxResult.error("此年度投资已存在!"); + } + } + @PostMapping("/addMonthInvestment") + public AjaxResult addMonthInvestment(@RequestBody SurProjectCostOutput where) { + List list=surProjectCostOutputService.selectSurProjectCostOutputList(where); + if(list.size()==0){ + surProjectCostOutputService.addMonthInvestment(where); + return AjaxResult.success("增加月度投资成功!"); + }else{ + return AjaxResult.error("此月度投资已存在!"); + } + } + + + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java index 21c1f87b..720c883e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java @@ -59,4 +59,14 @@ public interface ISurProjectCostOutputService * @return 结果 */ public int deleteSurProjectCostOutputById(Long id); + + /** + * 项目初始化 + * @param projectId + */ + public void initProject(long projectId); + + public void addYearInvestment(SurProjectCostOutput where); + + public void addMonthInvestment(SurProjectCostOutput where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java index 763e28be..af1b53e5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java @@ -1,6 +1,10 @@ package com.yanzhu.jh.project.service.impl; +import java.util.Calendar; +import java.util.Date; import java.util.List; + + import com.ruoyi.common.utils.DateUtils; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import com.yanzhu.jh.project.mapper.SurProjectCostOutputMapper; @@ -95,4 +99,62 @@ public class SurProjectCostOutputServiceImpl implements ISurProjectCostOutputSer { return surProjectCostOutputMapper.deleteSurProjectCostOutputById(id); } + + @Override + public void initProject(long projectId) { + Calendar calendar=Calendar.getInstance(); + int year=calendar.get(Calendar.YEAR); + SurProjectCostOutput it=new SurProjectCostOutput(); + it.setProjectId(projectId); + it.setMoney(0l); + it.setRemark(""); + it.setIsDel(0l); + it.setCostType(1l);//总投资 + insertSurProjectCostOutput(it); + it.setCostType(2l);//年度投资 + it.setYear(year*1l); + insertSurProjectCostOutput(it); + it.setYear(null); + it.setCostType(3l);//合同金额 + insertSurProjectCostOutput(it); + it.setCostType(4l);//合同支付金额 + insertSurProjectCostOutput(it); + it.setCostType(5l);//合同挂账金额 + insertSurProjectCostOutput(it); + it.setCostType(6l);//安措金额 + insertSurProjectCostOutput(it); + it.setCostType(7l);//安措支付金额 + insertSurProjectCostOutput(it); + it.setCostType(8l);//安措挂账金额 + insertSurProjectCostOutput(it); + it.setCostType(9l);//月度投资 + it.setYear(year*1l); + for(int i=1;i<=12;i++){ + it.setMonth(i*1l); + insertSurProjectCostOutput(it); + } + + } + + @Override + public void addYearInvestment(SurProjectCostOutput it) { + it.setMoney(0l); + it.setRemark(""); + it.setIsDel(0l); + it.setCostType(2l);//年度投资 + insertSurProjectCostOutput(it); + } + + @Override + public void addMonthInvestment(SurProjectCostOutput it) { + it.setMoney(0l); + it.setRemark(""); + it.setIsDel(0l); + it.setCostType(9l);//月度投资 + for(int i=1;i<=12;i++){ + it.setMonth(i*1l); + insertSurProjectCostOutput(it); + } + } } +