Merge remote-tracking branch 'origin/pre' into pre

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -1,12 +1,17 @@
 package com.xjrsoft.module.assessment.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +46,7 @@ public class AssessmentTemplatePlan implements Serializable {
      */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
+    private LocalDateTime createDate;
     /**
      *
      */
@@ -53,7 +58,7 @@ public class AssessmentTemplatePlan implements Serializable {
      */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
+    private LocalDateTime modifyDate;
     /**
      *
      */

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -818,6 +819,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                         .eq(AssessmentPlanAnswerClass::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(AssessmentPlanAnswerClass::getAssessmentTemplatePlanId, templatePlan.getId())
         );
+        String active = SpringUtil.getActiveProfile();
+        if (!"prod".equals(active)) {
+            return true;
+        }
         for (AssessmentPlanAnswerClass answerClass : classList) {
             this.sendMsg(new AssessmentTemplatePlanSureDto() {{
                 setClassId(answerClass.getClassId());

src/main/java/com/xjrsoft/module/internship/dto/AddInternshipPlanManageDto.java

@@ -120,4 +120,7 @@ public class AddInternshipPlanManageDto implements Serializable {
     @ApiModelProperty("学年")
     private String academicYear;
 
+    @ApiModelProperty("合作企业id")
+    private String internshipUnitId;
+
 }

src/main/java/com/xjrsoft/module/internship/entity/InternshipPlanClass.java

@@ -70,11 +70,6 @@ public class InternshipPlanClass implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-    * 所属实习计划id(internship_plan)
-    */
-    @ApiModelProperty("所属实习计划id(internship_plan)")
-    private Long internshipPlanId;
-    /**
     * 带队老师(internship_plan_teacher)
     */
     @ApiModelProperty("带队老师(internship_plan_teacher)")

src/main/java/com/xjrsoft/module/internship/entity/InternshipPlanManage.java

@@ -206,4 +206,7 @@ public class InternshipPlanManage implements Serializable {
     @EntityMapping(thisField = "id", joinField = "internshipPlanManageId")
     private List<InternshipPlanClass> internshipPlanClassList;
 
+    @ApiModelProperty("合作企业id")
+    private String internshipUnitId;
+
 }

src/main/java/com/xjrsoft/module/internship/service/impl/InternshipPlanManageServiceImpl.java

@@ -16,8 +16,10 @@ import com.xjrsoft.module.internship.mapper.InternshipPlanManageMapper;
 import com.xjrsoft.module.internship.mapper.InternshipPlanTeacherMapper;
 import com.xjrsoft.module.internship.service.IInternshipPlanManageService;
 import com.xjrsoft.module.internship.vo.InternshipPlanManagePageVo;
+import com.xjrsoft.module.veb.entity.CompanyCoop;
 import com.xjrsoft.module.veb.entity.TrainingOutside;
 import com.xjrsoft.module.veb.entity.TrainingSchool;
+import com.xjrsoft.module.veb.mapper.CompanyCoopMapper;
 import com.xjrsoft.module.veb.mapper.TrainingOutsideMapper;
 import com.xjrsoft.module.veb.mapper.TrainingSchoolMapper;
 import lombok.AllArgsConstructor;
@@ -45,6 +47,7 @@ public class InternshipPlanManageServiceImpl extends MPJBaseServiceImpl<Internsh
     private final BaseSemesterMapper semesterMapper;
     private final TrainingOutsideMapper trainingOutsideMapper;
     private final TrainingSchoolMapper trainingSchoolMapper;
+    private final CompanyCoopMapper companyCoopMapper;
 
 
     @Override
@@ -157,6 +160,12 @@ public class InternshipPlanManageServiceImpl extends MPJBaseServiceImpl<Internsh
             internshipPlanManage.setTrainingBaseName(trainingOutside.getTrainingName());
             internshipPlanManage.setTrainingBaseNumber(trainingOutside.getTrainingNumber());
         }
+        CompanyCoop companyCoop = companyCoopMapper.selectById(dto.getInternshipUnitId());
+        if(companyCoop != null){
+            internshipPlanManage.setInternshipUnitAddress(companyCoop.getCompanyPosition());
+            internshipPlanManage.setInternshipUnitName(companyCoop.getCompanyName());
+            internshipPlanManage.setInternshipSiteType(companyCoop.getCompanyType());
+        }
 
         internshipPlanManageMapper.insert(internshipPlanManage);
         return true;

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环 io境 dev|pre|prod
   profiles:
-    active: dev
+    active: pre
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/main/resources/sqlScript/20250623sql.sql

@@ -66,5 +66,8 @@ ALTER TABLE internship_plan_manage_participant
 ALTER TABLE internship_plan_manage
   ADD COLUMN STATUS INT NULL COMMENT '状态(0:草稿 1:实习中 2:已结束)' AFTER academic_year;
 
+ALTER TABLE internship_plan_manage
+  ADD COLUMN internship_unit_id BIGINT NULL COMMENT '实习单位id(company_coop)' AFTER STATUS;
+