审批记录显示人名、修改问题

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmBorrowServiceImpl.java

@@ -84,7 +84,6 @@ public class KeyDmBorrowServiceImpl {
         }
         map.put("expected_return_date", expected_return_date);
         if (id == null || String.valueOf(id).trim().isEmpty()) {
-            map.put("id",UUID.randomUUID().toString());
             map.put("application_no","borrow");
             map.put("applicant_id",user.get("id"));
             map.put("applicant_name", user.get("name"));

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmBorrowDetailDao.xml

@@ -6,7 +6,7 @@
         INSERT INTO jl_key_dm_borrow_application_detail(
             id,application_id,material_id,material_code,material_name,apply_quantity,unit,issue_remark,returned_quantity,damaged_quantity,is_used,create_by,create_time
         ) VALUES (
-            #{id},#{application_id},#{material_id},#{material_code},#{material_name},#{apply_quantity},#{unit},#{issue_remark},COALESCE(#{returned_quantity},0),COALESCE(#{damaged_quantity},0),1,#{_user.id},NOW()
+            UUID(),#{application_id},#{material_id},#{material_code},#{material_name},#{apply_quantity},#{unit},#{issue_remark},COALESCE(#{returned_quantity},0),COALESCE(#{damaged_quantity},0),1,#{_user.id},NOW()
         )
     </insert>
 

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmMaterialLogDao.xml

@@ -33,10 +33,12 @@
         </foreach>
     </insert>
     <select id="selectLogsByApplicationId" parameterType="map" resultType="map">
-        SELECT ml.*,m.material_name
+        SELECT ml.*,m.material_name,u.name
         FROM jl_key_dm_material_log as ml
         left join jl_key_dm_material as m
         on ml.material_id = m.id
+        left join jl_key_dm_user as u
+        on u.id = ml.create_by
         WHERE relation_id = #{id}
         AND ml.is_used = 1 ORDER BY ml.create_time ASC
     </select>