底稿归档显示项目信息

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -312,17 +312,11 @@
 
         ${ew.customSqlSegment}
         and cw_prnl.report_number is not null and cw_prnl.report_date is not null
-        <if test="sta == '超期未归档'">
-            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now())>60
-        </if>
-        <if test="sta == '暂时未归档'">
-            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now()) &lt;= 60
+        <if test="sta == '-2'">
+            and cw_pa.audit_date is null
         </if>
-        <if test="sta == '已超期归档'">
-            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date)>60
-        </if>
-        <if test="sta == '已按时归档'">
-            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) &lt;= 60
+        <if test="sta == '-1'">
+            and cw_pa.audit_date is not null
         </if>
         ORDER BY cw_pa.create_time DESC
     </select>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -555,6 +555,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
 
                     }
                 }
+
             }
         }
         String isBmzr = "0";

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/domain/HandoverDraft.java

@@ -31,4 +31,7 @@ public class HandoverDraft extends BaseEntity {
 
     @TableField(exist = false)
     private String department;  //部门
+
+    @TableField(exist = false)
+    private String user_id;  //离职人员的id
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/mapper/xml/HandoverDraftMapper.xml

@@ -24,10 +24,11 @@
         b.create_by_id as assigneeId,
         b.draft_administrator as draftAdministrator,
         su.name as name,
-        su.office_id as department
+        su.office_id as department,
+        su.id as userId
         from human_resources_depart_handover_draft a
         left join human_resources_depart_handover b on a.handover_id = b.id
-        left join sys_user su on a.create_by_id = su.id
+        left join sys_user su on b.create_by_id = su.id
         where a.id = #{id} and a.del_flag = '0'
     </select>
 </mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/service/HandoverService.java

@@ -183,7 +183,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
 
         Handover report = new Handover();
-        BeanUtils.copyProperties(reportData, report);
+        BeanUtils.copyProperties(reportData, report, "createById"); // 忽略 createById
         report.setUpdateById(userDTO.getId());
         report.setUpdateTime(new Date());