增加设备管理模块权限

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FeishuInfoController.java

@@ -482,6 +482,9 @@ public class FeishuInfoController {
         if (timeType.getNeedDeptAudit() == 1) {
             queryWrapper.or().eq("need_dept_audit", 1);
         }
+        if (company.getPackageDevice() == 1) {
+            queryWrapper.or().eq("package_device", 1);
+        }
 
         queryWrapper.orderByAsc("orderitem");
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/SysModule.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-03-18
+ * @since 2024-09-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -110,9 +110,6 @@ public class SysModule extends Model<SysModule> {
     @TableField("package_engineering")
     private Integer packageEngineering;
 
-    @TableField(exist = false)
-    private Integer packageFinanceAudit;
-
     /**
      * 是否属于合同管理
      */
@@ -143,17 +140,6 @@ public class SysModule extends Model<SysModule> {
     @TableField("need_dept_audit")
     private Integer needDeptAudit;
 
-
-    @TableField(exist = false)
-    private List<SysModule> children;
-
-
-    @TableField(exist = false)
-    private boolean checked;
-
-    @TableField(exist = false)
-    private List<SysFunction> functionList;
-
     /**
      * 是否属于供应商模块
      */
@@ -166,6 +152,22 @@ public class SysModule extends Model<SysModule> {
     @TableField("package_project_approval")
     private Integer packageProjectApproval;
 
+    /**
+     * 是否属于设备管理模块
+     */
+    @TableField("package_device")
+    private Integer packageDevice;
+
+
+    @TableField(exist = false)
+    private List<SysModule> children;
+
+
+    @TableField(exist = false)
+    private boolean checked;
+
+    @TableField(exist = false)
+    private List<SysFunction> functionList;
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/PermissionServiceImpl.java

@@ -207,6 +207,9 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
             if (company.getPackageProjectApproval() == 1) {
                 wrapper.or().eq("package_project_approval", 1);
             }
+            if (company.getPackageDevice() == 1) {
+                wrapper.or().eq("package_device", 1);
+            }
             if (timeType.getReportWorkflow() == 1) {
                 wrapper.or().eq("report_workflow", 1);
             }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/SysModuleMapper.xml

@@ -25,11 +25,12 @@
         <result column="need_dept_audit" property="needDeptAudit" />
         <result column="package_provider" property="packageProvider" />
         <result column="package_project_approval" property="packageProjectApproval" />
+        <result column="package_device" property="packageDevice" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, path, parent_id, icon, orderitem, is_menu, use_state, package_time, package_project, package_oa, package_expense, package_customer, package_engineering, package_contract, package_etimecard, report_workflow, package_finance, need_dept_audit, package_provider, package_project_approval
+        id, name, path, parent_id, icon, orderitem, is_menu, use_state, package_time, package_project, package_oa, package_expense, package_customer, package_engineering, package_contract, package_etimecard, report_workflow, package_finance, need_dept_audit, package_provider, package_project_approval, package_device
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -153,6 +153,7 @@
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageFinance">财务核算</el-checkbox></div>
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageProvider">供应商管理</el-checkbox></div>
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageProjectApproval">立项管理</el-checkbox></div>
+                        <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageDevice">设备管理</el-checkbox></div>
                     </div>
                     
                     <!-- <span>{{scope.row.packageWorktime ? "工时 +" : ""}}</span>
@@ -231,14 +232,17 @@
                     <el-form-item>
                         日报审核模式：
                         <el-select v-model="dialogData.reportAuditType" size="small">
-                            <el-option :value="0" label="项目审核人审核"></el-option>
-                            <el-option :value="1" label="任务分组负责人审核"></el-option>
-                            <el-option :value="2" label="先分组审核再PM审核"></el-option>
-                            <el-option :value="3" label="员工自由选择审批人"></el-option>
-                            <el-option :value="4" label="项目所属BU审核"></el-option>
-                            <el-option :value="5" label="所属部门负责人审核"></el-option>
-                            <el-option :value="6" label="直属或部门负责人审核->项目日报审核人审核"></el-option>
-                            <el-option :value="7" label="项目和部门并行审核"></el-option>
+                            <el-option :value="0" label="0-项目审核人审核"></el-option>
+                            <el-option :value="1" label="1-任务分组负责人审核"></el-option>
+                            <el-option :value="2" label="2-先分组审核再PM审核"></el-option>
+                            <el-option :value="3" label="3-员工自由选择审批人"></el-option>
+                            <el-option :value="4" label="4-项目所属BU审核"></el-option>
+                            <el-option :value="5" label="5-所属部门负责人审核"></el-option>
+                            <el-option :value="6" label="6-直属或部门负责人审核->项目日报审核人审核"></el-option>
+                            <el-option :value="7" label="7-项目和部门并行审核"></el-option>
+                            <el-option :value="8" label="8-项目设置复审人"></el-option>
+                            <el-option :value="9" label="9-分组负责人审核->项目日报审核人审核;"></el-option>
+                            <el-option :value="10" label="10-普通员工到项目经理，项目经理到单独审核人"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item>
@@ -255,6 +259,9 @@
                     <el-form-item><el-checkbox v-model="dialogData.enableNewWeeklyfill">是否启用新的按周填报模式</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.hideSubproject">是否去除子项目</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.userWithMultiDept">是否开启人员设置可填报部门</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.importReportAuditNormal">导入的日报正常审批</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.onlyShowPercent">工时报告页面，工时仅显示比例</el-checkbox></el-form-item>
+                    
                 </el-form>
             </div>
             <!-- 是否开启审批流设置，是否启用主项目模式，是否秘薪模式，是否显示日报审批流程，是否CRO企业，是否仅使用导入日报审核（不要项目审核） reportAuditType-->
@@ -411,6 +418,7 @@ import App from '../../App.vue';
                     this.dialogData.packageProvider = this.dialogData.packageProvider ? true : false,
                     this.dialogData.financeAudit = this.dialogData.financeAudit ? true : false
                     this.dialogData.packageProjectApproval = this.dialogData.packageProjectApproval ? true : false
+                    this.dialogData.packageDevice = this.dialogData.packageDevice ? true : false
                 }
                 else if(i == 'D'){ this.editDialogD = true }
                 else if (i=='E') {
@@ -700,6 +708,7 @@ import App from '../../App.vue';
                         packageFinance: this.dialogData.packageFinance ? 1 : 0,
                         packageProvider: this.dialogData.packageProvider ? 1 : 0,
                         packageProjectApproval: this.dialogData.packageProjectApproval ? 1 : 0,
+                        packageDevice: this.dialogData.packageDevice ? 1 : 0,
                     },
                 res => {
                     this.listLoading = false;
@@ -965,6 +974,7 @@ import App from '../../App.vue';
                             res.data.records[i].packageSimple == 1 ? arrList.push('简单表格') : ''
                             res.data.records[i].packageFinance == 1 ? arrList.push('财务核算') : ''
                             res.data.records[i].packageProjectApproval == 1 ? arrList.push('立项管理') : ''
+                            res.data.records[i].packageDevice == 1 ? arrList.push('设备管理') : ''
                             res.data.records[i].arrList = arrList
                         }
                         var list = res.data.records;

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/Company.java

@@ -19,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-02-21
+ * @since 2024-09-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -72,12 +72,6 @@ public class Company extends Model<Company> {
     @TableField("package_project")
     private Integer packageProject;
 
-    /**
-     * 立项管理
-     */
-    @TableField("package_project_approval")
-    private Integer packageProjectApproval;
-
     /**
      * 合同平台
      */
@@ -126,32 +120,30 @@ public class Company extends Model<Company> {
     @TableField("package_finance")
     private Integer packageFinance;
 
-
-    @TableField(exist = false)
-    private String wxCorpid;
-
-    @TableField(exist = false)
-    private String dingdingCorpid;
-
-    @TableField(exist = false)
-    private String feishuInfoid;
-
-
     /**
      * 供应商模块
      */
     @TableField("package_provider")
     private Integer packageProvider;
 
+    /**
+     * 立项管理
+     */
+    @TableField("package_project_approval")
+    private Integer packageProjectApproval;
+
+    /**
+     * 设备管理模块
+     */
+    @TableField("package_device")
+    private Integer packageDevice;
+
     /**
      * 是否是国际化版本
      */
     @TableField("is_international")
     private Integer isInternational;
 
-    /**
-     * 创建日期
-     */
     @TableField("create_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -166,6 +158,30 @@ public class Company extends Model<Company> {
     @TableField(exist = false)
     private long remainingValidDays;
 
+    /**
+     * 注册来源
+     */
+    @TableField("reg_from")
+    private String regFrom;
+
+    /**
+     * 非项目简单模式，该模式下非项目日报由部门主要负责人审核
+     */
+    @TableField("non_project_simple")
+    private Integer nonProjectSimple;
+
+
+    @TableField(exist = false)
+    private String wxCorpid;
+
+    @TableField(exist = false)
+    private String dingdingCorpid;
+
+    @TableField(exist = false)
+    private String feishuInfoid;
+
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-import java.util.List;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -17,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-03-25
+ * @since 2024-09-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -297,7 +295,7 @@ public class TimeType extends Model<TimeType> {
     private Integer mainProjectState;
 
     /**
-     * 日报的审核类型， 0-项目审核人审核，1-分组负责人审核，2-先分组负责人审核再项目负责人(PM)审核;3-员工自由选择审批人 4-项目所属BU审核 5-直属审核人或部门负责人审核,6-直属或部门负责人审核->项目日报审核人审核
+     * 日报的审核类型， 0-项目审核人审核，1-分组负责人审核，2-先分组负责人审核再项目负责人(PM)审核;3-员工自由选择审批人 4-项目所属BU审核 5-直属审核人或部门负责人审核,6-直属或部门负责人审核->项目日报审核人审核，7-项目和部门并行审核；8-项目设置复审人;9-分组负责人审核->项目日报审核人审核;10-普通员工到项目经理，项目经理到单独审核人
      */
     @TableField("report_audit_type")
     private Integer reportAuditType;
@@ -368,9 +366,6 @@ public class TimeType extends Model<TimeType> {
     @TableField("report_auto_approve_days")
     private Integer reportAutoApproveDays;
 
-    @TableField(exist = false)
-    private List<User> userList;
-
     /**
      * 日报填报时长上限，默认12小时
      */
@@ -533,6 +528,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("custom_degree_multiple")
     private Boolean customDegreeMultiple;
 
+    /**
+     * 任务分组是否必填
+     */
+    @TableField("task_group_required")
+    private Integer taskGroupRequired;
+
     /**
      * 任务是否必填 0-否 1-是
      */
@@ -569,6 +570,48 @@ public class TimeType extends Model<TimeType> {
     @TableField("user_with_multi_dept")
     private Integer userWithMultiDept;
 
+    /**
+     * 提醒审核日，默认周一
+     */
+    @TableField("alert_check_day")
+    private Integer alertCheckDay;
+
+    /**
+     * 提醒审核的文字消息
+     */
+    @TableField("alert_check_msg")
+    private String alertCheckMsg;
+
+    /**
+     * 导入的日报，按照正常审批来处理，非单独设置的部门直属领导审核
+     */
+    @TableField("import_report_audit_normal")
+    private Integer importReportAuditNormal;
+
+    /**
+     * 日报第二审核人；在reportAuditType5时有效
+     */
+    @TableField("second_auditor")
+    private String secondAuditor;
+
+    /**
+     * 日报第三审核人；在reportAuditType5时有效
+     */
+    @TableField("third_auditor")
+    private String thirdAuditor;
+
+    /**
+     * 工时报告页面，查看时仅显示比例；
+     */
+    @TableField("only_show_percent")
+    private Integer onlyShowPercent;
+
+    /**
+     * 是否校验考勤数据的加班时长
+     */
+    @TableField("verify_card_overtime")
+    private Integer verifyCardOvertime;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/CompanyMapper.xml

@@ -21,6 +21,7 @@
         <result column="package_finance" property="packageFinance" />
         <result column="package_provider" property="packageProvider" />
         <result column="package_project_approval" property="packageProjectApproval" />
+        <result column="package_device" property="packageDevice" />
         <result column="is_international" property="isInternational" />
         <result column="create_date" property="createDate" />
         <result column="reg_from" property="regFrom" />
@@ -29,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, package_project_approval, is_international, create_date, reg_from, non_project_simple
+        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, package_project_approval, package_device, is_international, create_date, reg_from, non_project_simple
     </sql>
 
 </mapper>