修改参培人员路由

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -137,6 +137,14 @@ public class CmcCarApprovalController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formDataJson.getString("carApplyId"));
+        cmcCarApproval.setCarUsage(formDataJson.getString("carUsage"));
+        cmcCarApproval.setDays(formDataJson.getLong("days"));
+        cmcCarApproval.setEndDate(formDataJson.getDate("endDate"));
+        cmcCarApproval.setBeginDate(formDataJson.getDate("beginDate"));
+        cmcCarApproval.setProjectId(formDataJson.getString("projectId"));
+        cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
+        cmcCarApproval.setApplyDate(formDataJson.getDate("applyDate"));
+        cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
         if (formDataJson.getString("deptComment") != null && formDataJson.getString("managerComment") == null) {
             cmcCarApproval.setDeptUserId(getLoginUser().getUserId());
             cmcCarApproval.setDeptComment(formDataJson.getString("deptComment"));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResource.java

@@ -22,12 +22,6 @@ public class CmcResource extends BaseEntity
     /** 资料id */
     private Integer resourceId;
 
-    /** 培训名称 */
-    private Integer trainId;
-    private CmcTrain train;
-    @Excel(name = "培训名称")
-    private String name;
-
     /** 上传人 */
     private Long uploader;
     @Excel(name = "上传人")
@@ -187,25 +181,6 @@ public class CmcResource extends BaseEntity
     {
         return resourceField;
     }
-    public void setTrainId(Integer trainId)
-    {
-        this.trainId = trainId;
-    }
-
-    public Integer getTrainId()
-    {
-        return trainId;
-    }
-    public void setTrain(CmcTrain train)
-    {
-        this.train = train;
-        this.name = train == null ? "" : train.getName();
-    }
-
-    public CmcTrain getTrain()
-    {
-        return train;
-    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="uploadUser"    javaType="SysUser"         resultMap="UploadUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="resourceField"    javaType="CmcResourceField"         resultMap="CmcResourceFieldResult" />
-        <association property="train"    javaType="CmcTrain"         resultMap="CmcTrainResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="UploadUserResult">
@@ -36,23 +35,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="field"    column="field"    />
     </resultMap>
 
-    <resultMap type="CmcTrain" id="CmcTrainResult">
-        <result property="trainId"    column="train_id"    />
-        <result property="name"    column="name"    />
-    </resultMap>
-
     <sql id="selectCmcResourceVo">
-        select r.resource_id, r.train_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, rf.field, r.upload_time, r.hours, t.name from cmc_resource as r
+        select r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, rf.field, r.upload_time, r.hours from cmc_resource as r
         left join sys_user as u on u.user_id = r.uploader
         left join sys_dept as d on d.dept_id = r.upload_dept
         left join cmc_resource_field as rf on rf.field_id = r.field_id
-        left join cmc_train as t on t.train_id = r.train_id
     </sql>
 
     <select id="selectCmcResourceList" parameterType="CmcResource" resultMap="CmcResourceResult">
         <include refid="selectCmcResourceVo"/>
-        <where>  
-            <if test="trainId != null "> and r.train_id = #{trainId}</if>
+        <where>
             <if test="uploader != null "> and r.uploader = #{uploader}</if>
             <if test="uploadDept != null "> and r.upload_dept = #{uploadDept}</if>
             <if test="title != null  and title != ''"> and r.title like concat('%', #{title}, '%')</if>