实习教师收集审核

src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectController.java

@@ -10,6 +10,7 @@ import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.LocalDateUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.internship.dto.AddInternshipTeacherCollectDto;
@@ -37,6 +38,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -94,6 +96,17 @@ public class InternshipTeacherCollectController {
     @XjrLog(value = "新增实习带队教师收集表")
     public RT<Boolean> add(@Valid @RequestBody AddInternshipTeacherCollectDto dto){
         InternshipTeacherCollect internshipTeacherCollect = BeanUtil.toBean(dto, InternshipTeacherCollect.class);
+        LocalDate now = LocalDate.now();
+        boolean dateInRange = LocalDateUtil.isDateInRange(now, internshipTeacherCollect.getStartDate(), internshipTeacherCollect.getEndDate());
+        if(dateInRange){
+            internshipTeacherCollect.setStatus(1);
+        }else{
+            if(now.isBefore(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(0);
+            }else if(now.isAfter(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(2);
+            }
+        }
         boolean isSuccess = internshipTeacherCollectService.save(internshipTeacherCollect);
         return RT.ok(isSuccess);
     }
@@ -103,10 +116,19 @@ public class InternshipTeacherCollectController {
     @SaCheckPermission("internshipteachercollect:edit")
     @XjrLog(value = "修改实习带队教师收集表")
     public RT<Boolean> update(@Valid @RequestBody UpdateInternshipTeacherCollectDto dto){
-
         InternshipTeacherCollect internshipTeacherCollect = BeanUtil.toBean(dto, InternshipTeacherCollect.class);
+        LocalDate now = LocalDate.now();
+        boolean dateInRange = LocalDateUtil.isDateInRange(now, internshipTeacherCollect.getStartDate(), internshipTeacherCollect.getEndDate());
+        if(dateInRange){
+            internshipTeacherCollect.setStatus(1);
+        }else{
+            if(now.isBefore(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(0);
+            }else if(now.isAfter(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(2);
+            }
+        }
         return RT.ok(internshipTeacherCollectService.updateById(internshipTeacherCollect));
-
     }
 
     @DeleteMapping

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -5203,4 +5203,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcinternship_plan_manage_participant() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("internship_plan_manage_participant");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("internship");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }