日常报销修改

ruoyi-psa/src/main/java/com/ruoyi/service/impl/FyglDailyReimbursementServiceImpl.java

@@ -108,6 +108,7 @@ public class FyglDailyReimbursementServiceImpl implements IFyglDailyReimbursemen
 //        int i1 = fyglDailyReimbursementMapper.insertFyglDailyReimbursement(fyglDailyReimbursement);
         //第二层表
         fyglDailyReimbursement.setStatus(2);
+
         fyglDailyReimbursement.setRegistrationTime(DateUtils.getNowDate());
         System.out.println();
         int i2 = fyglDailyReimbursementMapper.insertFyglDailyReimbursement2(fyglDailyReimbursement);

ruoyi-psa/src/main/resources/mapper/dailyReimbursement/FyglDailyReimbursementMapper.xml

@@ -92,9 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             r1.id,
             r1.serial_number,
+            r1.create_time,
+            r1.update_time,
             r1.reimbursement,
-            r2.create_by,
-            r2.update_time,
             p.project_name,
             p.project_number,
             p.project_type,
@@ -102,12 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT u.user_name FROM sys_user u WHERE u.user_id = p.department_leader_id) AS depart_name
         FROM
             fygl_daily_rembursement_relevancy_r r1,
-            fygl_daily_reimbursement r2,
             project_manage p
         WHERE
             r1.id = #{id}
-          AND r1.did = r2.id
-          AND p.id = r2.project_id
+          AND p.id = r1.project_id
 
     </select>
     <select id="getItemList"  resultType="com.ruoyi.domain.dto.FyglDailyReimbursementTableItemDTO">
@@ -201,7 +199,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="accessory != null">accessory,</if>
             <if test="serialNumber != null">serial_number,</if>
             <if test="registrationTime != null">registration_time,</if>
-            <if test="reimbursement != null">reimbursement</if>
+            <if test="reimbursement != null">reimbursement
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark</if></if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -209,7 +212,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="accessory != null">#{accessory},</if>
             <if test="serialNumber != null">#{serialNumber},</if>
             <if test="registrationTime != null">#{registrationTime},</if>
-            <if test="reimbursement != null">#{reimbursement}</if>
+            <if test="reimbursement != null">#{reimbursement}
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark}</if></if>
         </trim>
     </insert>
     <insert id="insertFyglDailyReimbursement3">