上传用户合同

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUserSubcontract.java

@@ -90,4 +90,6 @@ public class HlgUserSubcontract implements Serializable {
 
     private Integer contractId;
 
+    //是否自动续约（0：否 1：是）
+    private Integer isAutoRenew;
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserSubcontractServiceImpl.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,7 +57,13 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
         parameters.put("subcontractorId", hlgUserSubcontract.getSubcontractorId());
         parameters.put("workContract", hlgUserSubcontract.getWorkContract());
         parameters.put("startDate", hlgUserSubcontract.getStartDate());
-        parameters.put("endDate", hlgUserSubcontract.getEndDate());
+        parameters.put("isAutoRenew", hlgUserSubcontract.getIsAutoRenew());
+        if(hlgUserSubcontract.getIsAutoRenew()==1){
+            LocalDate startDate = LocalDate.parse("2100-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            parameters.put("endDate", startDate);
+        }else{
+            parameters.put("endDate", hlgUserSubcontract.getEndDate());
+        }
         parameters.put("createBy", sysUser.getUsername());
         parameters.put("contractId", hlgUserSubcontract.getContractId());
         log.info("param============{}", JSONObject.toJSONString(parameters));