Bläddra i källkod

修改导入项目,导入日志,新增工时计算。

anderx 1 år sedan
förälder
incheckning
1e2829eb4a

+ 47 - 0
.gitignore

@@ -0,0 +1,47 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

+ 27 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectStaffRecordInput.java

@@ -17,9 +17,36 @@ public class ProjectStaffRecordInput extends BaseEntity {
     private String projectName;
     private String projectName;
     private String startTime;
     private String startTime;
     private String endTime;
     private String endTime;
+    private String researchEnd;
+    private String researchStart;
+    private String adminName;
     private Integer fullJob;
     private Integer fullJob;
     private Long deptId;
     private Long deptId;
 
 
+    public String getResearchEnd() {
+        return researchEnd;
+    }
+
+    public void setResearchEnd(String researchEnd) {
+        this.researchEnd = researchEnd;
+    }
+
+    public String getResearchStart() {
+        return researchStart;
+    }
+
+    public void setResearchStart(String researchStart) {
+        this.researchStart = researchStart;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
     public Integer getProjectStatus() {
     public Integer getProjectStatus() {
         return projectStatus;
         return projectStatus;
     }
     }

+ 5 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -222,11 +222,15 @@
     <if test="companyId !=null">
     <if test="companyId !=null">
       and (d.dept_id= #{companyId} or find_in_set(#{companyId},d.ancestors))
       and (d.dept_id= #{companyId} or find_in_set(#{companyId},d.ancestors))
     </if>
     </if>
+      <if test="adminName != null"> and a.name  like concat ('%',#{adminName},'%')</if>
     <if test="projectStatus != null"> and a.project_status =#{projectStatus}</if>
     <if test="projectStatus != null"> and a.project_status =#{projectStatus}</if>
     <if test="projectNumber != null"> and b.project_number like concat ('%',#{projectNumber},'%')</if>
     <if test="projectNumber != null"> and b.project_number like concat ('%',#{projectNumber},'%')</if>
     <if test="projectName != null"> and b.name like concat ('%',#{projectName},'%')</if>
     <if test="projectName != null"> and b.name like concat ('%',#{projectName},'%')</if>
+    <if test="researchStart != null and researchEnd != null">
+      and( #{researchStart} between b.start_time and b.end_time or  #{researchEnd} between b.start_time and b.end_time)
+    </if>
     <if test="startTime != null and endTime != null">
     <if test="startTime != null and endTime != null">
-      and a.record_time between #{startTime} and #{endTime}
+      and b.start_time between #{startTime} and #{startTime}
     </if>
     </if>
     <if test="fullJob != null">and c.full_job= #{fullJob}</if>
     <if test="fullJob != null">and c.full_job= #{fullJob}</if>
     <if test="deptId != null">and (d.dept_id= #{deptId} or find_in_set(#{deptId},d.ancestors)) </if>
     <if test="deptId != null">and (d.dept_id= #{deptId} or find_in_set(#{deptId},d.ancestors)) </if>

+ 0 - 23
ruoyi-ui/.gitignore

@@ -1,23 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-**/*.log
-
-tests/**/coverage/
-tests/e2e/reports
-selenium-debug.log
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.local
-
-package-lock.json
-yarn.lock

+ 0 - 30
ruoyi-ui/README.md

@@ -1,30 +0,0 @@
-## 开发
-
-```bash
-# 克隆项目
-git clone https://gitee.com/y_project/RuoYi-Vue
-
-# 进入项目目录
-cd ruoyi-ui
-
-# 安装依赖
-npm install
-
-# 建议不要直接使用 cnpm 安装依赖,会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npmmirror.com
-
-# 启动服务
-npm run dev
-```
-
-浏览器访问 http://localhost:80
-
-## 发布
-
-```bash
-# 构建测试环境
-npm run build:stage
-
-# 构建生产环境
-npm run build:prod
-```