设备管理模块判断标志

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

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-03-18
+ * @since 2024-09-27
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -127,6 +127,12 @@ public class Company extends Model<Company> {
     @TableField("package_project_approval")
     private Integer packageProjectApproval;
 
+    /**
+     * 设备管理模块
+     */
+    @TableField("package_device")
+    private Integer packageDevice;
+
     /**
      * 是否是国际化版本
      */
@@ -145,9 +151,8 @@ public class Company extends Model<Company> {
     @TableField("reg_from")
     private String regFrom;
 
-
     /**
-     * 非项目采用简易模式，非项目工时由部门主要负责人审核
+     * 非项目简单模式，该模式下非项目日报由部门主要负责人审核
      */
     @TableField("non_project_simple")
     private Integer nonProjectSimple;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -167,7 +167,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<UserCateTimeVo> getMembProjectCateTime(Integer companyId, String startDate, String endDate,Integer departmentId,String subUserCustomName,Integer plateString);
 
-    @Update("update project set incharger_id = null, finish_date = null, plan_start_date = null, plan_end_date=null, level=null,contract_amount=0.0,man_day=null where id = #{id} and is_public = 1")
+    @Update("update project set incharger_id = null, finish_date = null, level=null,contract_amount=0.0,man_day=null where id = #{id} and is_public = 1")
     void cleanPublicProjectData(Integer id);
 
     List<Map<String, Object>> userProjectProcessList(Integer deptId, String userId, Integer projectId, Integer companyId,@Param("list") List<Integer> deptIds,@Param("listSecond") List<Integer> regularDeptIds, Integer start, Integer size);

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

@@ -1073,6 +1073,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 } else {
                     p.setCustomerName("");
                 }
+                System.out.println("p.getPlanStartDate() = " + p.getPlanStartDate());
                 if (projectMapper.updateById(p) == 0) {
                     //httpRespMsg.setError("操作失败");
                     httpRespMsg.setError(MessageUtils.message("other.operationFail"));

fhKeeper/formulahousekeeper/management-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>

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -589,7 +589,7 @@
                     </el-form-item>
 
 
-                    <el-form-item :label="$t('ommencementDate')" prop="planStartDate"  v-if="(user.company.nonProjectSimple == 0 || (user.company.nonProjectSimple == 1 && addForm.isPublic == 0))">
+                    <el-form-item :label="$t('ommencementDate')" prop="planStartDate"  >
                         <el-date-picker v-model="addForm.planStartDate" :disabled="canOnlyModParticipator"
                         :editable="false" style="width:32%;" 
                         format="yyyy-MM-dd"