删除需求截止时间相关

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/api/requirement/entity/HwRequirementAPI.java

@@ -129,13 +129,7 @@ public class HwRequirementAPI implements Serializable {
      */
     @Dict(dicCode = "authentication_status")
     private Integer authenticationStatus;
-    /**
-     * 发布截止
-     */
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date expiryDate;
     /**
      * 数据权限
      */
@@ -193,8 +187,6 @@ public class HwRequirementAPI implements Serializable {
     @TableField(exist = false)
     private String createTime1;  //用于发布时间查询
 
-    @TableField(exist = false)
-    private String expiryDate1;  //用于截止时间查询
 
     /**
      * 选择的公司id

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/entity/HwRequirement.java

@@ -122,13 +122,7 @@ public class HwRequirement implements Serializable {
      */
     @Dict(dicCode = "authentication_status")
     private java.lang.Integer authenticationStatus;
-    /**
-     * 发布截止
-     */
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date expiryDate;
     /**
      * 数据权限
      */
@@ -202,11 +196,6 @@ public class HwRequirement implements Serializable {
     @TableField(exist = false)
     private String createTime_end;
 
-    @TableField(exist = false)
-    private String expiryDate_begin;
-
-    @TableField(exist = false)
-    private String expiryDate_end;
 
 
     @TableField(exist = false)

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/mapper/xml/HwRequirementMapper.xml

@@ -25,7 +25,6 @@
 		a.service_contract_type AS "serviceContractType",
 		a.service_contract AS "serviceContract",
 		a.authentication_status AS "authenticationStatus",
-		a.expiry_date AS "expiryDate",
 		a.sys_org_code AS "sysOrgCode",
 		a.create_time AS "createTime",
 		a.create_by AS "createBy",
@@ -71,7 +70,6 @@
 		a.service_contract_type AS "serviceContractType",
 		a.service_contract AS "serviceContract",
 		a.authentication_status AS "authenticationStatus",
-		a.expiry_date AS "expiryDate",
 		a.sys_org_code AS "sysOrgCode",
 		a.create_time AS "createTime",
 		a.create_by AS "createBy",
@@ -141,9 +139,6 @@
 			<if test="hwRequirement.createTime_begin != null">
                 and a.create_time between #{hwRequirement.createTime_begin} and #{hwRequirement.createTime_end}
 			</if>
-			<if test="hwRequirement.expiryDate_begin != null ">
-                and a.expiry_date between #{hwRequirement.expiryDate_begin} and #{hwRequirement.expiryDate_end}
-			</if>
 			<if test="hwRequirement.subcontractQuery != null ">
 				<if test="hwRequirement.subcontractQuery == 1 ">
                       and a.subcontract_type is not null
@@ -189,7 +184,6 @@
 			contract_type,
 			service_contract,
 			authentication_status,
-			expiry_date,
 			sys_org_code,
 			create_time,
 			create_by,
@@ -224,7 +218,6 @@
 			#{contractType},
 			#{serviceContract},
 			#{authenticationStatus},
-			#{expiryDate},
 			#{sysOrgCode},
 			#{createTime},
 			#{createBy},

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/service/impl/HwRequirementServiceImpl.java

@@ -476,7 +476,7 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
 //                    return returnMap;
 //                }
 //            }
-            if(hwRequirement.getExpiryDate().getTime()<new Date().getTime() || hwRequirement.getIsOn()==0){
+            if( hwRequirement.getIsOn()==0){
                 returnMap.put("success", "1029");
                 return returnMap;
             }
@@ -542,10 +542,6 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
                         result.error500("需求已下架，无法生成订单");
                         return result;
                     }
-                    if(hwRequirement.getExpiryDate().getTime()<new Date().getTime()){
-                        result.error500("需求截止时间已过，无法生成订单");
-                        return result;
-                    }
                     List<HwOrder> list1=hwOrderService.findHwOrderListByUserIdAndRequireId(hwOrder.getUserId(),hwOrder.getRequirementId());
                     if(list1.size()>0){
                         result.error500("已生成订单，请刷新");