فهرست منبع

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

seyason 2 سال پیش
والد
کامیت
fb92d88932
15فایلهای تغییر یافته به همراه14106 افزوده شده و 87980 حذف شده
  1. BIN
      fhKeeper/formulahousekeeper/management-platform/20230302项目导入模板.xlsx
  2. 3 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java
  3. 7 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserLoginInfo.java
  4. 9 6
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
  5. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml
  6. 2 1
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserLoginInfoMapper.xml
  7. BIN
      fhKeeper/formulahousekeeper/management-platform/workTime.2023-03-02.log.gz
  8. BIN
      fhKeeper/formulahousekeeper/management-platform/workTime.2023-03-06.log.gz
  9. 12205 87959
      fhKeeper/formulahousekeeper/management-platform/workTime.log
  10. BIN
      fhKeeper/formulahousekeeper/ops-platform/octopus.2023-02-23.log.gz
  11. 1851 0
      fhKeeper/formulahousekeeper/ops-platform/octopus.log
  12. 16 0
      fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ProjectCategoryMapper.java
  13. 1 1
      fhKeeper/formulahousekeeper/ops-platform/src/main/resources/application.yml
  14. 10 10
      fhKeeper/formulahousekeeper/timesheet/config/index.js
  15. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

BIN
fhKeeper/formulahousekeeper/management-platform/20230302项目导入模板.xlsx


+ 3 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -363,6 +363,9 @@ public class Project extends Model<Project> {
     @TableField(exist = false)
     private String levelString;
 
+    @TableField(exist = false)
+    private String projectMainCode;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 7 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserLoginInfo.java

@@ -27,6 +27,12 @@ public class UserLoginInfo extends Model<UserLoginInfo> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 公司ID
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
     /**
      * 用户ID
      */
@@ -34,7 +40,7 @@ public class UserLoginInfo extends Model<UserLoginInfo> {
     private String userId;
 
     /**
-     * 用户第一次登陆的设备(1代表pc端,2代表手机端)
+     * 该公司第一次登陆的设备(1代表pc端,2代表手机端)
      */
     @TableField("first_login_device")
     private Integer firstLoginDevice;

+ 9 - 6
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -7980,17 +7980,20 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             ProjectMain projectMain=new ProjectMain();
                             projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
                             projectMain.setName(project.getProjectMainName());
+                            projectMain.setCode(project.getProjectMainCode());
                             projectMainMapper.insert(projectMain);
                             projectMainList.add(projectMain);
                         }
                     }
                     Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc ->pc.getName()!=null&& pc.getName().equals(project.getCategoryName())).findFirst();
-                    if(!category.isPresent()){
-                        ProjectCategory projectCategory=new ProjectCategory();
-                        projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
-                        projectCategory.setName(project.getCategoryName());
-                        projectCategoryMapper.insert(projectCategory);
-                        projectCategoryList.add(projectCategory);
+                    if(project.getCategoryName()!=null){
+                        if(!category.isPresent()){
+                            ProjectCategory projectCategory=new ProjectCategory();
+                            projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
+                            projectCategory.setName(project.getCategoryName());
+                            projectCategoryMapper.insert(projectCategory);
+                            projectCategoryList.add(projectCategory);
+                        }
                     }
                 }
                 for (Project project : projectList) {

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.180.183:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+    url: jdbc:mysql://47.101.180.183:3306/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: HuoshiDB@2022
     hikari:

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserLoginInfoMapper.xml

@@ -5,13 +5,14 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.UserLoginInfo">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="first_login_device" property="firstLoginDevice" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, first_login_device
+        id, company_id, user_id, first_login_device
     </sql>
 
 </mapper>

BIN
fhKeeper/formulahousekeeper/management-platform/workTime.2023-03-02.log.gz


BIN
fhKeeper/formulahousekeeper/management-platform/workTime.2023-03-06.log.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 12205 - 87959
fhKeeper/formulahousekeeper/management-platform/workTime.log


BIN
fhKeeper/formulahousekeeper/ops-platform/octopus.2023-02-23.log.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1851 - 0
fhKeeper/formulahousekeeper/ops-platform/octopus.log


+ 16 - 0
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ProjectCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProjectCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-02-23
+ */
+public interface ProjectCategoryMapper extends BaseMapper<ProjectCategory> {
+
+}

+ 1 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/resources/application.yml

@@ -104,7 +104,7 @@ referer:
     - ops.ttkuaiban.com
     - 47.101.180.183
     - mldworktime.ttkuaiban.com
-excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/error,/testClient,/corpWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*
+excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/error,/testClient,/corpWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*,/operation-record/*
 syncDDMembUrl: http://worktime.ttkuaiban.com/api/dingding/syncCorpMembs
 
 

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,20 +1,20 @@
 var path = require('path')
 
 //  var ip = '192.168.2.12'
-var ip = '47.101.180.183'
+//var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
 // var ip = '192.168.10.2'
 // var ip = '192.168.2.13' 
 
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 // 1196735749
 module.exports = {
   build: {

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -375,7 +375,7 @@
     </div>
     <div slot="footer" class="dialog-footer foooot">
         <el-button v-if="(user.id == addForm.createrId || currentProject.inchargerId == user.id || currentProject.creatorId == user.id || permissions.projectManagement) && canAddTask" @click.native="deleteTask()" style="float:left;">{{ $t('btn.delete') }}</el-button>
-        <el-button type="primary" v-if="user.userNameNeedTranslate == 1 && !meetingId" @click="meetingCli()">发起会议</el-button>
+        <el-button type="primary" v-if="user.userNameNeedTranslate == 1 && !meetingId && !integrationTask.stage" @click="meetingCli()">发起会议</el-button>
         <el-button @click.native="closeBounceds()">{{ $t('btn.cancel') }}</el-button>
         <el-button type="primary" @click="submitInsert" :loading="addLoading">{{ $t('btn.submit') }}</el-button>
     </div>