子项目是否必填控制

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

@@ -177,9 +177,9 @@ public class ContractDetailController {
         ContractDetail contractDetail = contractDetailService.getById(companyId);
         if(contractDetail!=null){
             contractDetail.setFinalize(1);
-        }
-        if(!contractDetailService.updateById(contractDetail)){
-            httpRespMsg.setError("验证失败");
+            if(!contractDetailService.updateById(contractDetail)){
+                httpRespMsg.setError("验证失败");
+            }
         }
         return httpRespMsg;
     }

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-01-17
+ * @since 2023-02-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -254,6 +254,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("is_secret_salary")
     private Integer isSecretSalary;
 
+    /**
+     * 0：节假日不提醒，1：节假日提醒
+     */
+    @TableField("alert_non_workday")
+    private Integer alertNonWorkday;
+
     /**
      * 0-每日提醒当天漏填 1-每日提醒昨天漏填
      */
@@ -413,6 +419,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("restart_task_need_reason")
     private Integer restartTaskNeedReason;
 
+    /**
+     * 0-否 1-是  子项目是否必填
+     */
+    @TableField("sub_pro_must_fill")
+    private Integer subProMustFill;
+
 
     @Override
     protected Serializable pkVal() {