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

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

@@ -7814,6 +7814,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         project.setCurrentStageId(stage.get().getId());
                     }else project.setCurrentStageName(null);
                     project.setCompanyId(thirdPartyInterface.getCompanyId());
+                    project.setCreateDate(LocalDate.now());
                     inertProjectList.add(project);
                 }
                 if(inertProjectList.size()>0&&saveBatch(inertProjectList)){

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

@@ -91,7 +91,7 @@ public class CompanyController {
             LocalDateTime now=LocalDateTime.now();
             re.setCanDelete(0);
             if(re.getCreateDate()!=null){
-                LocalDateTime createDate = re.getCreateDate().atTime(LocalTime.now());
+                LocalDateTime createDate = re.getCreateDate();
                 Duration between = Duration.between(createDate, now);
                 Integer count = reportMapper.selectCount(new QueryWrapper<Report>().eq("company_id", re.getId()).ge("create_date", now.minusYears(1)));
                 if(between.toDays()>90&&count.equals(0)){

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

@@ -2,7 +2,6 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -20,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-02-20
+ * @since 2023-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -144,7 +143,9 @@ public class Company extends Model<Company> {
      * 创建日期
      */
     @TableField("create_date")
-    private LocalDate createDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime createDate;
 
     @TableField(exist = false)
     private Integer activeUserCount;

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

@@ -29,14 +29,4 @@
         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, is_international, create_date
     </sql>
 
-    <delete id="deleteCompany" parameterType="com.management.platform.entity.Company">
-        DELETE t1,t2,t3,t4
-        FROM
-        company t1
-        LEFT JOIN alert_time t2 ON t2.company_id = t1.id
-        LEFT JOIN audit_workflow_setting t3 ON t3.company_id = t1.id
-        LEFT JOIN audit_workflow_time_setting t4 ON t4.company_id = t1.id
-        WHERE
-        t1.id = #{companyId}
-    </delete>
 </mapper>